Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Anton Vorontsov [Mon, 26 Apr 2010 17:56:19 +0000 (21:56 +0400)]
1  2 
drivers/power/ds2782_battery.c
drivers/power/wm831x_power.c

Simple merge
Simple merge