]> git.karo-electronics.de Git - mv-sheeva.git/commit - include/linux/pwm_backlight.h
Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 5 Jan 2011 10:06:55 +0000 (10:06 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 5 Jan 2011 10:06:55 +0000 (10:06 +0000)
commit74d2b7a34bb69dcbb0a83736c53c33bdc1a6d468
treea824b7da2936b0a19514541804874ce2c4ffd2d7
parent8c1b5306f0da93f5f9bb9aa7024828cb2b7ab387
parent2742f2ada3578db2fb676c1f23ad6a38d002608e
Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
sound/soc/samsung/smartq_wm8987.c