alistair23-linux/arch/um/drivers
Linus Torvalds 0f2cc4ecd8 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (52 commits)
  init: Open /dev/console from rootfs
  mqueue: fix typo "failues" -> "failures"
  mqueue: only set error codes if they are really necessary
  mqueue: simplify do_open() error handling
  mqueue: apply mathematics distributivity on mq_bytes calculation
  mqueue: remove unneeded info->messages initialization
  mqueue: fix mq_open() file descriptor leak on user-space processes
  fix race in d_splice_alias()
  set S_DEAD on unlink() and non-directory rename() victims
  vfs: add NOFOLLOW flag to umount(2)
  get rid of ->mnt_parent in tomoyo/realpath
  hppfs can use existing proc_mnt, no need for do_kern_mount() in there
  Mirror MS_KERNMOUNT in ->mnt_flags
  get rid of useless vfsmount_lock use in put_mnt_ns()
  Take vfsmount_lock to fs/internal.h
  get rid of insanity with namespace roots in tomoyo
  take check for new events in namespace (guts of mounts_poll()) to namespace.c
  Don't mess with generic_permission() under ->d_lock in hpfs
  sanitize const/signedness for udf
  nilfs: sanitize const/signedness in dealing with ->d_name.name
  ...

Fix up fairly trivial (famous last words...) conflicts in
drivers/infiniband/core/uverbs_main.c and security/tomoyo/realpath.c
2010-03-04 08:15:33 -08:00
..
chan_kern.c
chan_user.c
cow.h
cow_sys.h
cow_user.c
daemon.h
daemon_kern.c
daemon_user.c
fd.c
harddog_kern.c
harddog_user.c
hostaudio_kern.c
line.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
Makefile
mcast.h
mcast_kern.c
mcast_user.c
mconsole_kern.c Switch may_open() and break_lease() to passing O_... 2010-03-03 13:00:21 -05:00
mconsole_user.c
mmapper_kern.c um: Remove BKL from mmapper 2009-10-14 15:35:51 +02:00
net_kern.c trivial: remove unnecessary semicolons 2009-09-21 15:14:58 +02:00
net_user.c
null.c
pcap_kern.c
pcap_user.c
pcap_user.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
port.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
port_kern.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
port_user.c
pty.c
random.c um: Remove BKL from random 2009-10-14 15:35:51 +02:00
slip.h
slip_common.c
slip_common.h
slip_kern.c UML: Fix some apparent bitrot 2009-06-25 11:22:13 -07:00
slip_user.c
slirp.h
slirp_kern.c UML: Fix some apparent bitrot 2009-06-25 11:22:13 -07:00
slirp_user.c
ssl.c
ssl.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
stderr_console.c
stdio_console.c
stdio_console.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
tty.c
ubd_kern.c block: Consolidate phys_segment and hw_segment limits 2010-02-26 13:58:08 +01:00
ubd_user.c
vde.h
vde_kern.c
vde_user.c
xterm.c
xterm.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
xterm_kern.c