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

..

caching

fscache: convert object to use workqueue instead of slow-work

2010-07-22 22:58:34 +02:00

configfs

Documentation: make configfs example code simpler, clearer

2010-11-18 15:00:46 -08:00

nfs

NFS: rename nfs.upcall -> nfs.idmap

2010-10-26 13:57:10 -04:00

pohmelfs

Staging: Pohmelfs: Added IO permissions and priorities.

2009-04-17 11:06:30 -07:00

9p.txt

fs/9p: Add access = client option to opt in acl evaluation.

2010-10-28 09:08:46 -05:00

00-INDEX

smbfs: move to drivers/staging

2010-10-05 09:08:21 -07:00

adfs.txt

Fix typos in /Documentation : 'U-Z'

2006-11-30 04:58:40 +01:00

affs.txt

Documentation: update broken web addresses.

2010-08-04 15:21:40 +02:00

afs.txt

AFS: Documentation updates

2009-08-19 10:40:13 -07:00

autofs4-mount-control.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

automount-support.txt

VFS: Unexport do_kern_mount() and clean up simple_pin_fs()

2006-06-09 09:34:16 -04:00

befs.txt

Documentation: update broken web addresses.

2010-08-04 15:21:40 +02:00

bfs.txt

remove mention of CONFIG_KMOD from documentation

2008-07-22 19:24:29 +10:00

btrfs.txt

Btrfs: Add Documentation/filesystem/btrfs.txt, remove old COPYING

2009-01-07 09:54:24 -05:00

ceph.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

cifs.txt

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

coda.txt

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cramfs.txt

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

debugfs.txt

Document the debugfs API

2009-06-06 10:28:14 -06:00

devpts.txt

Document usage of multiple-instances of devpts

2009-01-02 10:19:36 -08:00

directory-locking

Documentation: Fix up docs still talking about i_sem

2007-05-24 10:16:17 -07:00

dlmfs.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

dnotify_test.c

Documentation/fs/: split txt and source files

2010-03-12 15:52:35 -08:00

dnotify.txt

Documentation/fs/: split txt and source files

2010-03-12 15:52:35 -08:00

ecryptfs.txt

eCryptfs: Move ecryptfs docs into Documentation/filesystems/

2007-07-17 10:23:08 -07:00

exofs.txt

trivial: some small fixes in exofs documentation

2009-12-10 09:59:16 +02:00

ext2.txt

Doc fix: ext2 can only have 32,000 subdirs, not 32,768

2009-06-18 13:03:44 -07:00

ext3.txt

ext3: make barrier options consistent with ext4

2010-05-21 19:30:41 +02:00

ext4.txt

ext4: add support for lazy inode table initialization

2010-10-27 21:30:05 -04:00

fiemap.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

files.txt

fix f_count description in Documentation/filesystems/files.txt

2008-12-31 18:07:42 -05:00

fuse.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

gfs2-glocks.txt

GFS2: Update docs

2009-05-19 10:23:23 +01:00

gfs2-uevents.txt

GFS2: Add a document explaining GFS2's uevents

2009-08-17 11:11:41 +01:00

gfs2.txt

GFS2: docs update

2010-03-29 14:28:52 +01:00

hfs.txt

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

hfsplus.txt

Documentation: document HFSPlus

2007-07-31 15:39:38 -07:00

hpfs.txt

Documentation/: it's -> its where appropriate

2010-04-23 02:09:52 +02:00

inotify.txt

[PATCH] inotify (5/5): update kernel documentation

2006-06-20 05:25:19 -04:00

isofs.txt

Documentation: update broken web addresses.

2010-08-04 15:21:40 +02:00

jfs.txt

JFS: document uid, gid, and umask mount options in jfs.txt

2007-03-09 10:27:31 -06:00

Locking

fs: provide rcu-walk aware permission i_ops

2011-01-07 17:50:29 +11:00

locks.txt

Documentation: move locks.txt in filesystems/

2007-10-09 18:32:45 -04:00

logfs.txt

fix "seperate" typos in comments

2010-05-10 11:56:30 +02:00

Makefile

Documentation/fs/: split txt and source files

2010-03-12 15:52:35 -08:00

mandatory-locking.txt

locks: add warning about mandatory locking races

2007-10-09 18:32:45 -04:00

ncpfs.txt

ncpfs: remove dead URL from documentation

2009-09-23 07:39:42 -07:00

nilfs2.txt

nilfs2: add nodiscard mount option

2010-07-23 10:02:12 +09:00

ntfs.txt

NTFS: update homepage

2008-09-02 19:21:37 -07:00

ocfs2.txt

ocfs2: Add a mount option "coherency=*" to handle cluster coherency for O_DIRECT writes.

2010-10-11 14:14:55 -07:00

omfs.txt

omfs: add filesystem documentation

2008-07-26 12:00:05 -07:00

path-lookup.txt

fs: provide rcu-walk aware permission i_ops

2011-01-07 17:50:29 +11:00

porting

fs: provide rcu-walk aware permission i_ops

2011-01-07 17:50:29 +11:00

proc.txt

console: add /proc/consoles

2010-11-16 12:50:17 -08:00

quota.txt

quota: documentation for sending "below quota" messages via netlink and tiny doc update

2008-08-12 16:07:27 -07:00

ramfs-rootfs-initramfs.txt

Trivial Documentation/filesystems/ramfs-rootfs-initramfs.txt fix

2008-11-30 11:40:56 -08:00

relay.txt

relay: add buffer-only channels; useful for early logging

2008-07-26 12:00:04 -07:00

romfs.txt

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

seq_file.txt

seq_file: use proc_create() in documentation

2009-12-16 07:20:07 -08:00

sharedsubtree.txt

Documentation: Fix trivial typo in filesystems/sharedsubtree.txt

2010-10-25 21:18:21 -04:00

spufs.txt

Fix typos in /Documentation : 'U-Z'

2006-11-30 04:58:40 +01:00

squashfs.txt

Squashfs: update Kconfig and documentation for LZO

2010-08-05 23:42:54 +01:00

sysfs-pci.txt

PCI: Allow read/write access to sysfs I/O port resources

2010-07-30 09:32:08 -07:00

sysfs-tagging.txt

sysfs-namespaces: add a high-level Documentation file

2010-05-21 09:37:31 -07:00

sysfs.txt

sysfs: Fix one more signature discrepancy between sysfs implementation and docs.

2010-08-05 13:53:34 -07:00

sysv-fs.txt

[PATCH] fs/sysv/: doc cleanup

2006-12-07 08:39:44 -08:00

tmpfs.txt

mempolicy: document cpuset interaction with tmpfs mpol mount option

2010-05-25 08:06:57 -07:00

ubifs.txt

UBIFS: remove fast unmounting

2009-01-29 16:34:30 +02:00

udf.txt

udf: implement mode and dmode mounting options

2009-04-02 12:29:50 +02:00

ufs.txt

[PATCH] ufs2 write: mount as rw

2007-02-12 09:48:40 -08:00

vfat.txt

Documentation: update broken web addresses.

2010-08-04 15:21:40 +02:00

vfs.txt

fs: provide rcu-walk aware permission i_ops

2011-01-07 17:50:29 +11:00

xfs-delayed-logging-design.txt

xfs: remove experimental tag from the delaylog option

2010-11-10 12:00:47 -06:00

xfs.txt

xfs: remove obsolete osyncisosync mount option

2010-07-26 13:16:51 -05:00

xip.txt

DOC: update xip method info

2008-11-12 17:17:17 -08:00