David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c		2008-07-18 02:39:39 -07:00
..
act2000
capi	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
divert
gigaset	tty: The big operations rework	2008-04-30 08:29:47 -07:00
hardware	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
hisax
hysdn	isdn: use simple_read_from_buffer()	2008-06-10 12:50:14 -07:00
i4l	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-07-18 02:39:39 -07:00
icn
isdnloop
pcbit
sc	drivers/isdn/sc/ioctl.c: add missing kfree	2008-06-12 18:05:41 -07:00
Kconfig
Makefile