Merge branch 'linus'
commitdabe97823335d881f1034eb13a8a0a55bc14abd4
authorIngo Molnar <mingo@elte.hu>
Thu, 4 Aug 2011 19:37:54 +0000 (4 21:37 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 4 Aug 2011 19:37:54 +0000 (4 21:37 +0200)
tree7107e00bf5396a62d1a6fb040d4be94ee984ee24
parentf26353a457ea15f74d9b35b10521aa81c8cb74d5
parent53d1e658df6e26d62500410719aaee2b82067c03
Merge branch 'linus'
drivers/acpi/battery.c
fs/Kconfig