projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e69a8c a9ff8f6)
Merge branch 'fixes' into for-linus
authorRussell King <[email protected]>
Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
committerRussell King <[email protected]>
Wed, 15 Oct 2008 22:16:07 +0000 (23:16 +0100)
Conflicts:

arch/arm/mach-versatile/core.c

1  2 
arch/arm/plat-omap/devices.c patch | diff1 | diff2 | blob | history
drivers/serial/8250.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/plat-omap/devices.c
Simple merge
diff --cc drivers/serial/8250.c
Simple merge
John Crispins staging tree