]> git.baikalelectronics.ru Git - kernel.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)
commita9d4f7cc635360119059d1869e6712424a323719
treebdfc0fd037ad1380d75cefa0e47be24e344d977c
parent70bbc0cf9135ae9224a0cb8d6a1e7cef4f5694ab
parent65a6c77256fa4277c52c3cf972f6ea05f3558c78
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