ntsov@ru.mvista.com> 1253663367 +0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/power/wm97xx_battery.c
�N�:�3x