1
linux/fs/proc
Linus Torvalds 56b85f32d5 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits)
  serial: apbuart: Fixup apbuart_console_init()
  TTY: Add tty ioctl to figure device node of the system console.
  tty: add 'active' sysfs attribute to tty0 and console device
  drivers: serial: apbuart: Handle OF failures gracefully
  Serial: Avoid unbalanced IRQ wake disable during resume
  tty: fix typos/errors in tty_driver.h comments
  pch_uart : fix warnings for 64bit compile
  8250: fix uninitialized FIFOs
  ip2: fix compiler warning on ip2main_pci_tbl
  specialix: fix compiler warning on specialix_pci_tbl
  rocket: fix compiler warning on rocket_pci_ids
  8250: add a UPIO_DWAPB32 for 32 bit accesses
  8250: use container_of() instead of casting
  serial: omap-serial: Add support for kernel debugger
  serial: fix pch_uart kconfig & build
  drivers: char: hvc: add arm JTAG DCC console support
  RS485 documentation: add 16C950 UART description
  serial: ifx6x60: fix memory leak
  serial: ifx6x60: free IRQ on error
  Serial: EG20T: add PCH_UART driver
  ...

Fixed up conflicts in drivers/serial/apbuart.c with evil merge that
makes the code look fairly sane (unlike either side).
2011-01-07 14:39:20 -08:00
..
array.c
base.c Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin 2011-01-07 08:56:33 -08:00
cmdline.c
cpuinfo.c
devices.c
generic.c fs: dcache reduce branches in lookup path 2011-01-07 17:50:28 +11:00
inode.c fs: icache RCU free inodes 2011-01-07 17:50:26 +11:00
internal.h
interrupts.c
Kconfig
kcore.c
kmsg.c
loadavg.c
Makefile console: add /proc/consoles 2010-11-16 12:50:17 -08:00
meminfo.c
mmu.c
nommu.c
page.c
proc_console.c console: add /proc/consoles 2010-11-16 12:50:17 -08:00
proc_devtree.c
proc_net.c
proc_sysctl.c fs: provide rcu-walk aware permission i_ops 2011-01-07 17:50:29 +11:00
proc_tty.c
root.c switch procfs to ->mount() 2010-10-29 04:17:01 -04:00
softirqs.c procfs: fix /proc/softirqs formatting 2010-10-27 18:03:13 -07:00
stat.c /proc/stat: fix scalability of irq sum of all cpu 2010-10-27 18:03:13 -07:00
task_mmu.c pagemap: set pagemap walk limit to PMD boundary 2010-11-25 06:50:46 +09:00
task_nommu.c
uptime.c
version.c
vmcore.c ARM: 6485/5: proc/vmcore - allow archs to override vmcore_elf_check_arch() 2010-11-30 13:39:55 +00:00