Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile		2011-03-20 18:14:55 -07:00
..
act2000	isdn: Free irq_data namespace	2010-10-04 11:00:55 +02:00
capi	tty: now phase out the ioctl file pointer for good	2011-02-17 11:59:56 -08:00
divert	isdn: potential buffer overflows	2010-09-06 18:29:18 -07:00
gigaset	tty: now phase out the ioctl file pointer for good	2011-02-17 11:59:56 -08:00
hardware	drivers:isdn:istream.c Fix typo pice to piece	2011-02-28 12:07:32 -08:00
hisax	isdn: change to new flag variable	2011-03-17 14:05:34 +01:00
hysdn	isdn: hysdn: Kill (partially buggy) CVS regision log reporting.	2011-02-09 13:56:53 -08:00
i4l	tty: now phase out the ioctl file pointer for good	2011-02-17 11:59:56 -08:00
icn	isdn: icn: Fix potentially wrong string handling	2011-02-01 14:17:51 -08:00
isdnloop	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
mISDN	mISDN: fix printk typo fushing	2011-02-15 10:25:48 +01:00
pcbit	drivers/isdn: Use static const char * const where possible	2010-09-14 20:22:02 -07:00
sc	isdn: strcpy() => strlcpy()	2010-10-08 10:21:22 -07:00
Kconfig	isdn: fix a few Kconfig imperfections	2010-02-22 15:45:53 -08:00
Makefile	mISDN fix main ISDN Makefile	2008-08-02 16:28:20 +02:00