Linus Torvalds
7e20ef030d
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (49 commits)
[SCTP]: Set assoc_id correctly during INIT collision.
[SCTP]: Re-order SCTP initializations to avoid race with sctp_rcv()
[SCTP]: Fix the SO_REUSEADDR handling to be similar to TCP.
[SCTP]: Verify all destination ports in sctp_connectx.
[XFRM] SPD info TLV aggregation
[XFRM] SAD info TLV aggregationx
[AF_RXRPC]: Sort out MTU handling.
[AF_IUCV/IUCV] : Add missing section annotations
[AF_IUCV]: Implementation of a skb backlog queue
[NETLINK]: Remove bogus BUG_ON
[IPV6]: Some cleanups in include/net/ipv6.h
[TCP]: zero out rx_opt in tcp_disconnect()
[BNX2]: Fix TSO problem with small MSS.
[NET]: Rework dev_base via list_head (v3)
[TCP] Highspeed: Limited slow-start is nowadays in tcp_slow_start
[BNX2]: Update version and reldate.
[BNX2]: Print bus information for PCIE devices.
[BNX2]: Add 1-shot MSI handler for 5709.
[BNX2]: Restructure PHY event handling.
[BNX2]: Add indirect spinlock.
...
2007-05-04 19:36:58 -07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
2007-05-04 17:38:48 -07:00
uevent: use add_uevent_var() instead of open coding it
2007-04-27 10:57:29 -07:00
libata: honour host controllers that want just one host
2007-04-30 17:43:48 -07:00
PCI: Cleanup the includes of <linux/pci.h>
2007-05-02 19:02:35 -07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
2007-05-04 18:04:48 -07:00
[NET]: Rework dev_base via list_head (v3)
2007-05-03 15:13:45 -07:00
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
2007-05-04 18:16:12 -07:00
[CRYPTO] padlock: Remove pointless padlock module
2007-05-02 22:08:26 +10:00
remove "struct subsystem" as it is no longer needed
2007-05-02 18:57:59 -07:00
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
2007-04-30 08:58:21 -07:00
Merge branch 'linux-2.6' into for-2.6.22
2007-04-30 12:38:01 +10:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
2007-05-04 18:04:29 -07:00
IDE: remove rwsem use from ide-proc core
2007-04-27 10:57:30 -07:00
PCI: Cleanup the includes of <linux/pci.h>
2007-05-02 19:02:35 -07:00
PCI: Cleanup the includes of <linux/pci.h>
2007-05-02 19:02:35 -07:00
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
2007-05-04 18:16:12 -07:00
PCI: Cleanup the includes of <linux/pci.h>
2007-05-02 19:02:35 -07:00
CUDA ADB fixes
2007-05-04 17:59:07 -07:00
[BLOCK] Don't pin lots of memory in mempools
2007-04-30 09:08:17 +02:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
2007-05-04 18:04:29 -07:00
PCI: Cleanup the includes of <linux/pci.h>
2007-05-02 19:02:35 -07:00
uevent: use add_uevent_var() instead of open coding it
2007-04-27 10:57:29 -07:00
PCI: Cleanup the includes of <linux/pci.h>
2007-05-02 19:02:35 -07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2007-05-04 19:36:58 -07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2007-05-04 19:36:58 -07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
2007-05-04 18:04:48 -07:00
PCI: Cleanup the includes of <linux/pci.h>
2007-05-02 19:02:35 -07:00
PNP: stop using the subsystem rwsem
2007-04-27 10:57:30 -07:00
ps3av: Use __func__ instead of __FUNCTION__
2007-05-04 17:59:09 -07:00
[S390] tape: New read configuration data.
2007-05-04 18:48:26 +02:00
PCI: Cleanup the includes of <linux/pci.h>
2007-05-02 19:02:35 -07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
2007-05-04 18:04:29 -07:00
Merge branch 'linux-2.6' into for-2.6.22
2007-04-30 12:38:01 +10:00
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
2007-05-04 18:16:12 -07:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
2007-05-04 18:04:29 -07:00
Amiga Zorro bus: kill resource_size_t warnings
2007-05-04 17:59:08 -07:00
i2c: Add i2c_board_info and i2c_new_device()
2007-05-01 23:26:31 +02:00
7e20ef030d