Merge branch 'ab8500-from-Rajanikanth'

Browse Source

Conflicts:
	drivers/power/ab8500_bmdata.c

...

This commit is contained in:

Anton Vorontsov 2013-01-05 17:35:35 -08:00

parent 240fbe2347 e3e71007b0

commit 86b1e8294e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available