git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	David Howells <dhowells@redhat.com>
	Tue, 5 Dec 2006 14:37:56 +0000 (14:37 +0000)
committer	David Howells <dhowells@warthog.cambridge.redhat.com>
	Tue, 5 Dec 2006 14:37:56 +0000 (14:37 +0000)
commit	4c1ac1b49122b805adfa4efc620592f68dccf5db
tree	87557f4bc2fd4fe65b7570489c2f610c45c0adcd	tree \| snapshot
parent	c4028958b6ecad064b1a6303a6a5906d4fe48d73	commit \| diff
parent	d916faace3efc0bf19fe9a615a1ab8fa1a24cd93	commit \| diff

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

John Crispins staging tree

RSS Atom

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