Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAnton Vorontsov <cbouatmailru@gmail.com>
Mon, 26 Apr 2010 17:56:19 +0000 (21:56 +0400)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Mon, 26 Apr 2010 17:56:19 +0000 (21:56 +0400)
commit8ef1bb539203629f77a61976e4f25415e1083bff
tree4fee25aca0928f112716fb02d27b1b355d0843b4
parenta3bcbbee83f55cbaec9b2ad748e7300c7feb2192
parentb91ce4d14a21fc04d165be30319541e0f9204f15
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/power/ds2782_battery.c
drivers/power/wm831x_power.c