Merge branch 'master' of git://git.kernel.org/pub/scm/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>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 2a4ac9bd6a3a..86bcf63b6ba5 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -272,8 +272,11 @@ static void aircable_read(struct work_struct *work)
          */
         tty = port->tty;
 
-        if (!tty)
+        if (!tty) {
                 schedule_work(&priv->rx_work);
+                err("%s - No tty available", __FUNCTION__);
+                return ;
+        }
 
         count = min(64, serial_buf_data_avail(priv->rx_buf));
 
@@ -307,9 +310,7 @@ static int aircable_probe(struct usb_serial *serial,
 
         for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) {
                 endpoint = &iface_desc->endpoint[i].desc;
-                if (((endpoint->bEndpointAddress & 0x80) == 0x00) &&
-                        ((endpoint->bmAttributes & 3) == 0x02)) {
-                        /* we found our bulk out endpoint */
+                if (usb_endpoint_is_bulk_out(endpoint)) {
                         dbg("found bulk out on endpoint %d", i);
                         ++num_bulk_out;
                 }