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	fix ! versus & precedence in various places	2008-02-06 10:40:59 -08:00
capi	Merge commit 'v2.6.26' into bkl-removal	2008-07-14 15:29:34 -06:00
divert	isdn: use non-racy method for proc entries creation	2008-04-29 08:06:22 -07:00
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	hisax: depend on CONFIG_PNP, not __ISAPNP__	2008-04-28 08:58:34 -07:00
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	fix ! versus & precedence in various places	2008-02-06 10:40:59 -08:00
isdnloop	drivers/isdn: correct use of ! and &	2008-03-04 16:35:16 -08:00
pcbit	Convert files to UTF-8 and some cleanups	2007-10-19 23:21:04 +02:00
sc	drivers/isdn/sc/ioctl.c: add missing kfree	2008-06-12 18:05:41 -07:00
Kconfig	Use menuconfig objects: ISDN	2007-07-21 17:49:17 -07:00
Makefile