1
0
Fork 0
alistair23-linux/drivers/tty/hvc
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
..
Kconfig tty: move Kconfig entries into drivers/tty from drivers/char 2011-02-22 15:41:47 -08:00
Makefile Merge 2.6.38-rc6 into tty-next 2011-02-24 11:36:31 -08:00
hvc_beat.c
hvc_bfin_jtag.c hvc: add Blackfin JTAG console support 2011-02-17 11:12:40 -08:00
hvc_console.c
hvc_console.h
hvc_dcc.c hvc_dcc: Simplify assembly for v6 and v7 ARM 2011-02-03 16:05:43 -08:00
hvc_irq.c
hvc_iseries.c
hvc_iucv.c
hvc_rtas.c
hvc_tile.c
hvc_udbg.c
hvc_vio.c
hvc_xen.c xen/hvc: Disable probe_irq_on/off from poking the hvc-console IRQ line. 2011-03-10 00:57:59 -05:00
hvcs.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-03-18 10:37:40 -07:00
hvsi.c tiocmset: kill the file pointer argument 2011-02-17 11:52:43 -08:00