]> 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 <avorontsov@ru.mvista.com>
Tue, 22 Sep 2009 23:49:27 +0000 (03:49 +0400)
committerAnton Vorontsov <avorontsov@ru.mvista.com>
Tue, 22 Sep 2009 23:49:27 +0000 (03:49 +0400)
commitf056878332a91ed984a116bad4e7d49aefff9e6e
tree572f4757c8e7811d45e0be0c2ae529c78fb63441
parent3961f7c3cf247eee5df7fabadc7a40f2deeb98f3
parent7fa07729e439a6184bd824746d06a49cca553f15
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
drivers/power/wm97xx_battery.c
drivers/input/touchscreen/wm97xx-core.c
drivers/power/wm97xx_battery.c
include/linux/wm97xx.h