]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorAnton Vorontsov <cbouatmailru@gmail.com>
Sat, 18 Oct 2008 16:28:24 +0000 (20:28 +0400)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Sat, 18 Oct 2008 16:28:24 +0000 (20:28 +0400)
commited8c3174dd227031d1f3b9fa4fbb512f8f623434
treebac4953f8899d6600f4716c0bcde1e25e34c2591
parent8aef7e8f8de2d900da892085edbf14ea35fe6881
parent0cfd81031a26717fe14380d18275f8e217571615
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/power/Makefile
drivers/power/Kconfig
drivers/power/Makefile
drivers/power/power_supply_core.c