Andres Salomon
ef2a4524d6
proc: unify PROC_DEVICETREE config ...
Microblaze and PPC both use PROC_DEVICETREE, and OLPC will as well.. put
the Kconfig option into fs/ rather than in arch/*/Kconfig.
Signed-off-by: Andres Salomon <dilinger@queued.net>
[grant.likely@secretlab.ca: changed depends to PROC_FS && !SPARC]
[grant.likely@secretlab.ca: moved to drivers/of/Kconfig]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-07-05 16:46:43 -06:00
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2010-06-10 07:35:41 -07:00
Merge branch 'for-linus' of git://www.jni.nu/cris
2010-06-01 08:51:25 -07:00
FRV: Reinstate null behaviour for the GDB remote protocol 'p' command
2010-06-09 12:42:44 -07:00
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
2010-06-01 08:55:52 -07:00
KVM: ia64: Add missing spin_unlock in kvm_arch_hardware_enable()
2010-06-09 18:48:40 +03:00
m32r: invoke oom-killer from page fault
2010-06-04 15:21:44 -07:00
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
2010-06-01 08:55:52 -07:00
proc: unify PROC_DEVICETREE config
2010-07-05 16:46:43 -06:00
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
2010-06-01 08:55:52 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2010-06-11 14:15:44 -07:00
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
2010-06-01 08:55:52 -07:00
proc: unify PROC_DEVICETREE config
2010-07-05 16:46:43 -06:00
[S390] Update default configuration.
2010-06-08 18:58:23 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2010-06-04 15:42:09 -07:00
of: remove architecture CONFIG_OF definitions
2010-07-05 16:14:54 -06:00
arch/um: fix kunmap_atomic() call in skas/uaccess.c
2010-06-04 15:21:45 -07:00
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
2010-06-11 14:19:45 -07:00
xtensa: invoke oom-killer from page fault
2010-06-04 15:21:44 -07:00
ef2a4524d6