git.baikalelectronics.ru Git - kernel.git/commit

author	Len Brown <len.brown@intel.com>
	Tue, 2 Aug 2011 21:22:09 +0000 (17:22 -0400)
committer	Len Brown <len.brown@intel.com>
	Tue, 2 Aug 2011 21:22:09 +0000 (17:22 -0400)
commit	2410bf57ec404384d4c21da699be60bb7f5e133f
tree	5e4fc5e59d4393fd08852665a6da1ecbbfd0d8b3	tree \| snapshot
parent	0e711b1a62cbefb7deaf1f013d5a28c0e4a2619a	commit \| diff
parent	0788c687de5663ca19937900a4f98817abfb8dd2	commit \| diff
parent	941cf628fe7e984a25eb9f01ac62f598455d1fe7	commit \| diff
parent	a0e5b3b0a9bccad6aa0c4a1c10df5b708fe7428a	commit \| diff
parent	64aae9918333ec088fe9268e3da26732c1dba5e3	commit \| diff
parent	dfb111ace6c480cb9fcc7f6cb03b1d1196232fe5	commit \| diff
parent	0386896e71be94dff484b0d2aaf038a311b92a66	commit \| diff
parent	80854587deab455b2d4035ff36996fcbfa7ea3e8	commit \| diff

Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from-akpm', 'kexec-param' and 'misc' into release

Conflicts:
Documentation/kernel-parameters.txt

Signed-off-by: Len Brown <len.brown@intel.com>

drivers/acpi/battery.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/acpi/osl.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history