Mark Brown 0afc8c733e Merge branch 'for-2.6.37' into for-2.6.38 ...

Conflicts:
	include/linux/mfd/wm8994/pdata.h

2010-12-06 14:14:47 +00:00

..

core.h

…

gpio.h

…

pdata.h

Merge branch 'for-2.6.37' into for-2.6.38

2010-12-06 14:14:47 +00:00

registers.h

…