Linus Torvalds bac5e54c29 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 ... * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits) direct I/O fallback sync simplification ocfs: stop using do_sync_mapping_range cleanup blockdev_direct_IO locking make generic_acl slightly more generic sanitize xattr handler prototypes libfs: move EXPORT_SYMBOL for d_alloc_name vfs: force reval of target when following LAST_BIND symlinks (try #7) ima: limit imbalance msg Untangling ima mess, part 3: kill dead code in ima Untangling ima mess, part 2: deal with counters Untangling ima mess, part 1: alloc_file() O_TRUNC open shouldn't fail after file truncation ima: call ima_inode_free ima_inode_free IMA: clean up the IMA counts updating code ima: only insert at inode creation time ima: valid return code from ima_inode_alloc fs: move get_empty_filp() deffinition to internal.h Sanitize exec_permission_lite() Kill cached_lookup() and real_lookup() Kill path_lookup_open() ... Trivial conflicts in fs/direct-io.c		2009-12-16 12:04:02 -08:00
..
9p	9p connect fixes	2009-12-16 12:16:41 -05:00
802	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00
8021q	netdevice: provide common routine for macvlan and vlan operstate management	2009-12-03 15:59:22 -08:00
appletalk	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
atm	atm: [br2684] allow routed mode operation again	2009-12-08 20:22:31 -08:00
ax25	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
bluetooth	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
can	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-16 10:33:18 -08:00
dcb	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
dccp	tcp: Fix a connect() race with timewait sockets	2009-12-08 20:17:51 -08:00
decnet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
dsa	netdev: convert pseudo-devices to netdev_tx_t	2009-09-01 01:13:07 -07:00
econet	net: use net_eq to compare nets	2009-11-25 15:14:13 -08:00
ethernet	remove deprecated and not used: print_mac()	2009-11-15 22:21:34 -08:00
ieee802154	net: use net_eq to compare nets	2009-11-25 15:14:13 -08:00
ipv4	Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux	2009-12-16 10:43:34 -08:00
ipv6	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6	2009-12-15 21:08:53 -08:00
ipx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
irda	tree-wide: convert open calls to remove spaces to skip_spaces() lib function	2009-12-15 08:53:32 -08:00
iucv	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
key	xfrm: Fix truncation length of authentication algorithms installed via PF_KEY	2009-12-11 15:07:57 -08:00
lapb
llc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
mac80211	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-11 17:12:17 -08:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-16 10:33:18 -08:00
netlabel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
netlink	net: use net_eq to compare nets	2009-11-25 15:14:13 -08:00
netrom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
packet	packet: dont call sleeping functions while holding rcu_read_lock()	2009-12-15 21:12:21 -08:00
phonet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
rds	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2009-12-16 10:32:31 -08:00
rfkill	net/rfkill/core.c: work around gcc-4.0.2 silliness	2009-12-07 16:51:23 -05:00
rose	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
rxrpc	net: use net_eq to compare nets	2009-11-25 15:14:13 -08:00
sched	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
sctp	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
sunrpc	Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6	2009-12-16 10:47:44 -08:00
tipc	net: Move && and || to end of previous line	2009-11-29 16:55:45 -08:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
wanrouter	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
wimax	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
wireless	wireless: update old static regulatory domain rules	2009-12-10 16:21:51 -05:00
x25	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-12-08 07:55:01 -08:00
compat.c	net: use compat helper functions in compat_sys_recvmmsg	2009-12-11 15:07:57 -08:00
Kconfig	net/compat/wext: send different messages to compat tasks	2009-07-15 08:53:39 -07:00
Makefile	net: remove redundant sched/ in net/Makefile	2009-07-12 20:11:14 -07:00
nonet.c
socket.c	switch alloc_file() to passing struct path	2009-12-16 12:16:42 -05:00
sysctl_net.c
TUNABLE