1
0
Fork 0
alistair23-linux/drivers/isdn
Linus Torvalds e16b396ce3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
2011-03-18 10:37:40 -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: hisax: Use l2headersize() instead of dup (and buggy) func. 2011-02-15 12:18:09 -08: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