Skip to content
Commit f0568783 authored by Anton Vorontsov's avatar Anton Vorontsov
Browse files

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

Conflicts:
	drivers/power/wm97xx_battery.c
parents 3961f7c3 7fa07729
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment