]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a3f318 9c0c730)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Thu, 24 Sep 2009 22:13:11 +0000 (15:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 24 Sep 2009 22:13:11 +0000 (15:13 -0700)
commit7ae4b15d61567a4f0eff8ffefc8f6e13939a397a
treede6ca90295730343c495be8d98be8efa322140eftree | snapshot
parent3a3f318eae4c5e44043b73efe50049a5bbb0ad51commit | diff
parent9c0c730195ecaa6aa21dd461f70bee100f887782commit | diff
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/cpc-usb/TODO
drivers/staging/cpc-usb/cpc-usb_drv.c
drivers/staging/cpc-usb/cpc.h
drivers/staging/cpc-usb/cpc_int.h
drivers/staging/cpc-usb/cpcusb.h
arch/arm/mach-at91/at91sam9263_devices.c diff1 | diff2 | blob | history
arch/arm/mach-at91/board-sam9263ek.c diff1 | diff2 | blob | history
arch/arm/mach-at91/include/mach/board.h diff1 | diff2 | blob | history
drivers/net/Kconfig diff1 | diff2 | blob | history
drivers/net/sky2.c diff1 | diff2 | blob | history
drivers/net/tun.c diff1 | diff2 | blob | history
drivers/staging/Kconfig diff1 | diff2 | blob | history
drivers/staging/Makefile diff1 | diff2 | blob | history
kernel/sys_ni.c diff1 | diff2 | blob | history
lib/vsprintf.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.