Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 9734 additions and 19 deletions
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