projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5196d20 7c7ed8e)
Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Fri, 3 Feb 2012 22:12:42 +0000 (23:12 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 3 Feb 2012 22:13:05 +0000 (23:13 +0100)
Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)

1  2 
drivers/media/dvb/frontends/drxk_hard.c patch | diff1 | diff2 | blob | history
drivers/mfd/ab5500-core.c patch | diff1 | diff2 | blob | history

diff --cc drivers/mfd/ab5500-core.c
Simple merge
John Crispins staging tree