David S. Miller 08abe18af1 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/net/wimax/i2400m/usb-notif.c

2009-03-26 15:23:24 -07:00

..

configs

m68knommu: defconfig for M5407C3 board

2008-07-23 15:11:27 +10:00

kernel

m68knommu: fix syscall restarting

2009-01-27 16:42:03 +10:00

lib

Generic semaphore implementation

2008-04-17 10:42:34 -04:00

mm

m68knommu: use generic show_mem()

2008-07-26 12:00:11 -07:00

platform

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-03-26 15:23:24 -07:00

defconfig

m68knommu: update defconfig

2008-03-04 08:04:11 -08:00

Kconfig

m68knommu: remove the no longer used PCI support option

2009-01-27 16:42:02 +10:00

Kconfig.debug

m68knommu: removing config variable DUMPTOFLASH

2008-02-05 09:44:21 -08:00

Makefile

m68knommu: remove obsolete and unused eLIA board

2009-01-27 16:42:02 +10:00