]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit83928e17b92b7a667bfe674f1b330619adc2ac88
treebdfc0fd037ad1380d75cefa0e47be24e344d977c
parent9be16a03928642f944915b8c05945fd87b7a15cb
parent50f4c001bc1534db77663592496204ceba151e97
Merge master.kernel.org:/home/rmk/linux-2.6-arm

Minor manual fixups for gfp_t clashes.
drivers/net/Kconfig
drivers/usb/gadget/pxa2xx_udc.c