]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Howells <dhowells@redhat.com>
Tue, 5 Dec 2006 14:37:56 +0000 (14:37 +0000)
committerDavid Howells <dhowells@warthog.cambridge.redhat.com>
Tue, 5 Dec 2006 14:37:56 +0000 (14:37 +0000)
commit4c1ac1b49122b805adfa4efc620592f68dccf5db
tree87557f4bc2fd4fe65b7570489c2f610c45c0adcd
parentc4028958b6ecad064b1a6303a6a5906d4fe48d73
parentd916faace3efc0bf19fe9a615a1ab8fa1a24cd93
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
87 files changed:
block/as-iosched.c
block/cfq-iosched.c
block/ll_rw_blk.c
drivers/ata/libata-scsi.c
drivers/char/random.c
drivers/char/tpm/tpm.c
drivers/char/tty_io.c
drivers/char/vt.c
drivers/infiniband/core/addr.c
drivers/infiniband/core/cm.c
drivers/infiniband/core/cma.c
drivers/infiniband/core/iwcm.c
drivers/infiniband/core/mad.c
drivers/infiniband/ulp/ipoib/ipoib.h
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/infiniband/ulp/ipoib/ipoib_multicast.c
drivers/infiniband/ulp/srp/ib_srp.c
drivers/media/dvb/cinergyT2/cinergyT2.c
drivers/media/video/saa6588.c
drivers/mmc/mmc.c
drivers/mmc/mmc_sysfs.c
drivers/net/bnx2.c
drivers/net/cassini.c
drivers/net/chelsio/common.h
drivers/net/chelsio/cxgb2.c
drivers/net/e100.c
drivers/net/e1000/e1000_main.c
drivers/net/ixgb/ixgb_main.c
drivers/net/myri10ge/myri10ge.c
drivers/net/phy/phy.c
drivers/net/r8169.c
drivers/net/skge.c
drivers/net/spider_net.c
drivers/net/sungem.c
drivers/net/wireless/bcm43xx/bcm43xx.h
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/ipw2100.c
drivers/net/wireless/ipw2200.c
drivers/net/wireless/prism54/isl_ioctl.c
drivers/net/wireless/prism54/isl_ioctl.h
drivers/net/wireless/prism54/islpci_dev.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/net/wireless/prism54/islpci_eth.h
drivers/net/wireless/prism54/islpci_mgt.c
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/net/wireless/zd1211rw/zd_mac.h
drivers/pcmcia/ds.c
drivers/rtc/rtc-dev.c
drivers/usb/atm/speedtch.c
drivers/usb/atm/ueagle-atm.c
drivers/usb/class/cdc-acm.c
drivers/usb/core/hub.c
drivers/usb/core/message.c
drivers/usb/core/usb.c
drivers/usb/gadget/ether.c
drivers/usb/host/u132-hcd.c
drivers/usb/input/hid-core.c
drivers/usb/misc/ftdi-elan.c
drivers/usb/misc/phidgetkit.c
drivers/usb/misc/phidgetmotorcontrol.c
drivers/usb/net/pegasus.c
drivers/usb/net/usbnet.c
drivers/usb/serial/aircable.c
drivers/usb/serial/digi_acceleport.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/usb-serial.c
fs/aio.c
fs/bio.c
fs/reiserfs/journal.c
include/linux/mmc/host.h
include/linux/reiserfs_fs_sb.h
include/linux/tty.h
include/linux/usb.h
include/net/sctp/structs.h
include/scsi/libsas.h
kernel/kmod.c
net/atm/lec.c
net/atm/lec.h
net/core/netpoll.c
net/dccp/minisocks.c
net/ieee80211/softmac/ieee80211softmac_auth.c
net/ieee80211/softmac/ieee80211softmac_scan.c
net/ipv4/tcp_minisocks.c
net/sctp/associola.c
net/sctp/endpointola.c
net/xfrm/xfrm_policy.c
net/xfrm/xfrm_state.c