summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/proc-arm1020.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-02 22:37:18 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-02 22:37:18 +0200
commit90d5ffc729e92bffc0f84e2447e2e6dc280240a5 (patch)
treeee8e912a1e92ea612843af7492199e977f29ee89 /arch/arm/mm/proc-arm1020.S
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff)
parentcnic: Fix NETDEV_UP event processing. (diff)
downloadlinux-90d5ffc729e92bffc0f84e2447e2e6dc280240a5.tar.xz
linux-90d5ffc729e92bffc0f84e2447e2e6dc280240a5.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: (46 commits) cnic: Fix NETDEV_UP event processing. uvesafb/connector: Disallow unpliviged users to send netlink packets pohmelfs/connector: Disallow unpliviged users to configure pohmelfs dst/connector: Disallow unpliviged users to configure dst dm/connector: Only process connector packages from privileged processes connector: Removed the destruct_data callback since it is always kfree_skb() connector/dm: Fixed a compilation warning connector: Provide the sender's credentials to the callback connector: Keep the skb in cn_callback_data e1000e/igb/ixgbe: Don't report an error if devices don't support AER net: Fix wrong sizeof net: splice() from tcp to pipe should take into account O_NONBLOCK net: Use sk_mark for routing lookup in more places sky2: irqname based on pci address skge: use unique IRQ name IPv4 TCP fails to send window scale option when window scale is zero net/ipv4/tcp.c: fix min() type mismatch warning Kconfig: STRIP: Remove stale bits of STRIP help text NET: mkiss: Fix typo tg3: Remove prev_vlan_tag from struct tx_ring_info ...
Diffstat (limited to 'arch/arm/mm/proc-arm1020.S')
0 files changed, 0 insertions, 0 deletions