Merge branch 'linus' into out-of-tree
commit693d6e748e6e5553e15f69ab2fe18c01f5878150
authorIngo Molnar <mingo@elte.hu>
Thu, 18 Aug 2011 16:25:42 +0000 (18 18:25 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 18 Aug 2011 16:25:42 +0000 (18 18:25 +0200)
tree4a8b1f6411af040bcf5938d580ee24437cbfdd86
parent3dc26eb6c1731aad36fe9d74f6547de46012ccdc
parent72ed62bdc46d76c965fb95aecb5d0bf97c976723
Merge branch 'linus' into out-of-tree
drivers/acpi/battery.c
drivers/platform/x86/Kconfig
fs/Kconfig
fs/cifs/cifs_debug.c
sound/soc/codecs/Kconfig