projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9be16a0 50f4c00)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:24:22 +0000 (09:24 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:24:22 +0000 (09:24 -0700)
Minor manual fixups for gfp_t clashes.

1  2 
drivers/net/Kconfig patch | diff1 | diff2 | blob | history
drivers/usb/gadget/pxa2xx_udc.c patch | diff1 | diff2 | blob | history

diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/usb/gadget/pxa2xx_udc.c
Simple merge
John Crispins staging tree