merge

diff --cc drivers/base/firmware_class.c
Simple merge

diff --cc fs/super.c
Simple merge

diff --cc kernel/Makefile
index 93155e52bb54365e12105271bd1186092fc6994d,fd79e9348117bf95e8f0c65629d3e2a230856721..c4337751cee71696a341d83441c2bad69f6dace4
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -24,7 -24,7 +24,8 @@@ obj-$(CONFIG_STOP_MACHINE) += stop_mach
  obj-$(CONFIG_AUDIT) += audit.o
  obj-$(CONFIG_AUDITSYSCALL) += auditsc.o
  obj-$(CONFIG_KPROBES) += kprobes.o
 +obj-$(CONFIG_SYSFS) += ksysfs.o
+ obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
  
  ifneq ($(CONFIG_IA64),y)
  # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is