diff options
author | 2010-04-19 07:27:45 -0700 | |
---|---|---|
committer | 2010-04-19 07:27:45 -0700 | |
commit | 375db4810b27306ea400ab39d3d6f7a063ac9ff6 (patch) | |
tree | f2cb778036dbfcade394c9e5ad94a69137fd352c /fs/ecryptfs/inode.c | |
parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
parent | gigaset: include cleanup cleanup (diff) | |
download | linux-dev-375db4810b27306ea400ab39d3d6f7a063ac9ff6.tar.xz linux-dev-375db4810b27306ea400ab39d3d6f7a063ac9ff6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
gigaset: include cleanup cleanup
packet : remove init_net restriction
WAN: flush tx_queue in hdlc_ppp to prevent panic on rmmod hw_driver.
ip: Fix ip_dev_loopback_xmit()
net: dev_pick_tx() fix
fib: suppress lockdep-RCU false positive in FIB trie.
tun: orphan an skb on tx
forcedeth: fix tx limit2 flag check
iwlwifi: work around bogus active chains detection
Diffstat (limited to 'fs/ecryptfs/inode.c')
0 files changed, 0 insertions, 0 deletions