David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
9p	9p changes for the 3.4 merge window	2012-03-28 09:58:38 -07:00
adfs
affs
afs
autofs4	autofs: make the autofsv5 packet file descriptor use a packetized pipe	2012-04-29 13:30:08 -07:00
befs
bfs
btrfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-04-28 09:30:07 -07:00
cachefiles
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2012-03-28 10:01:29 -07:00
cifs	Use correct conversion specifiers in cifs_show_options	2012-04-24 11:36:25 -05:00
coda	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
configfs
cramfs
debugfs	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
devpts
dlm	dlm fixes for 3.4	2012-04-23 18:22:42 -07:00
ecryptfs
efs
exofs	Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd	2012-03-28 20:04:27 -07:00
exportfs
ext2	migrate ext2_fs.h guts to fs/ext2/ext2.h	2012-03-31 16:03:16 -04:00
ext3	ext3: move headers to fs/ext3/	2012-03-31 16:03:16 -04:00
ext4	Ext4 bug fixes for 3.4	2012-04-23 19:52:00 -07:00
fat	fat: fix bug in enforcing Long File Name length	2012-03-23 16:58:40 -07:00
freevxfs
fscache
fuse	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse	2012-04-18 17:29:05 -07:00
gfs2	GFS2: Instruct DLM to avoid queue convert slowdown	2012-04-24 13:26:50 +01:00
hfs
hfsplus
hostfs	Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2012-03-27 18:29:53 -07:00
hpfs
hppfs
hugetlbfs	hugetlbfs: lockdep annotate root inode properly	2012-04-25 21:26:34 -07:00
isofs
jbd
jbd2	jbd2: use GFP_NOFS for blkdev_issue_flush	2012-04-23 21:43:41 -04:00
jffs2	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
jfs
lockd	lockd: fix the endianness bug	2012-04-13 13:50:52 -04:00
logfs
minix
ncpfs	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
nfs	NFSv4.1: Use the correct hostname in the client identifier string	2012-04-30 12:04:58 -04:00
nfs_common
nfsd	nfsd: fix nfs4recover.c printk format warning	2012-04-30 12:28:48 -07:00
nilfs2
nls
notify	fs/notify/notification.c: make subsys_initcall function static	2012-03-23 16:58:31 -07:00
ntfs
ocfs2	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-23 23:15:17 -04:00
omfs
openpromfs
proc	revert "proc: clear_refs: do not clear reserved pages"	2012-04-25 21:26:34 -07:00
pstore	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
qnx4
qnx6
quota	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs	2012-03-28 10:00:14 -07:00
ramfs
reiserfs	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
romfs	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
squashfs	Add an extra mount time sanity check, plus some code cleanups and bug fixes.	2012-03-28 18:05:54 -07:00
sysfs	sysfs: handle 'parent deleted before child added'	2012-04-10 14:48:51 -07:00
sysv
ubifs	- Improve error messages	2012-03-23 09:27:40 -07:00
udf	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs	2012-03-28 10:00:14 -07:00
ufs	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
xfs	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
aio.c	kill mm argument of vm_munmap()	2012-04-21 01:58:20 -04:00
anon_inodes.c
attr.c
bad_inode.c
binfmt_aout.c	VM: add "vm_mmap()" helper function	2012-04-20 17:29:13 -07:00
binfmt_elf_fdpic.c	VM: add "vm_mmap()" helper function	2012-04-20 17:29:13 -07:00
binfmt_elf.c	VM: add "vm_mmap()" helper function	2012-04-20 17:29:13 -07:00
binfmt_em86.c
binfmt_flat.c	VM: add "vm_mmap()" helper function	2012-04-20 17:29:13 -07:00
binfmt_misc.c	magic.h: move some FS magic numbers into magic.h	2012-03-23 16:58:31 -07:00
binfmt_script.c
binfmt_som.c	VM: add "vm_mmap()" helper function	2012-04-20 17:29:13 -07:00
bio-integrity.c
bio.c
block_dev.c	magic.h: move some FS magic numbers into magic.h	2012-03-23 16:58:31 -07:00
buffer.c	fs/buffer.c: remove BUG() in possible but rare condition	2012-04-25 21:26:33 -07:00
char_dev.c
compat_binfmt_elf.c
compat_ioctl.c	The following text was taken from the original review request:	2012-03-24 10:24:31 -07:00
compat.c	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
dcache.c	vfs: fix d_ancestor() case in d_materialize_unique	2012-03-28 09:54:34 -07:00
dcookies.c
direct-io.c
drop_caches.c
eventfd.c
eventpoll.c	epoll: clear the tfile_check_list on -ELOOP	2012-04-25 21:26:33 -07:00
exec.c	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-04-04 10:04:42 -07:00
fcntl.c
fhandle.c
fifo.c
file_table.c
file.c	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
filesystems.c
fs_struct.c	The following text was taken from the original review request:	2012-03-24 10:24:31 -07:00
fs-writeback.c	trivial writeback fixes	2012-03-28 10:07:27 -07:00
generic_acl.c
inode.c
internal.h
ioctl.c
ioprio.c
Kconfig
Kconfig.binfmt
libfs.c	dentry leak in simple_fill_super() failure exit	2012-04-09 01:39:22 -04:00
locks.c	CIFS: Fix VFS lock usage for oplocked files	2012-04-01 13:54:27 -05:00
Makefile
mbcache.c
mount.h
mpage.c
namei.c	Make the "word-at-a-time" helper functions more commonly usable	2012-04-06 13:54:56 -07:00
namespace.c
no-block.c
open.c
pipe.c	pipes: add a "packetized pipe" mode for writing	2012-04-29 13:12:42 -07:00
pnode.c
pnode.h
posix_acl.c
proc_namespace.c
read_write.c
read_write.h
readdir.c
select.c	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
seq_file.c	The following text was taken from the original review request:	2012-03-24 10:24:31 -07:00
signalfd.c
splice.c	tcp: tcp_sendpages() should call tcp_push() once	2012-04-05 19:04:27 -04:00
stack.c
stat.c	The following text was taken from the original review request:	2012-03-24 10:24:31 -07:00
statfs.c
super.c	The following text was taken from the original review request:	2012-03-24 10:24:31 -07:00
sync.c
timerfd.c
utimes.c
xattr_acl.c
xattr.c	fs/xattr.c:setxattr(): improve handling of allocation failures	2012-04-05 15:25:50 -07:00