Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

Conflicts:
	drivers/net/usb/asix.c
	drivers/net/wireless/iwlwifi/iwl-agn-rs.c
	drivers/usb/serial/option.c

diff --cc Makefile
Simple merge

diff --cc arch/arm/kernel/smp.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc drivers/gpio/Kconfig
index 3b8f6043bf0c4436e1ce47da74bc4f33e73b92d8,80ccce9f6721ce71e03f9df577dd5e088e8ffc71..1eb284d433bdb2fe1c3149f8859b48af3622d474
mode 100755,100644..100755
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig

diff --cc drivers/media/video/uvc/uvc_v4l2.c
Simple merge

diff --cc drivers/mmc/core/sdio.c
index ee715e73b3f7ef12b4365bbfc1cd01b34cf30378,9b18b5416599dc81b5e9a711a6a6050155058a63..e1bf6274cf0c9e677825e3fab4d036ea64a5e1e2
mode 100755,100644..100755
--- 1/drivers/mmc/core/sdio.c
--- 2/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c

diff --cc drivers/mtd/nand/nand_bbt.c
Simple merge

diff --cc drivers/net/Kconfig
index 9c9eec33143b6108eb08758531bc4238558d8560,0c3f234afc067c46a7505e1ab4ec077fd9a67ced..0a47cad725809569732c3633b5bf390d3e66dbb1
mode 100755,100644..100755
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/tty/serial/serial_core.c
Simple merge

diff --cc drivers/usb/serial/option.c
index a01fedbca7e60c1de09908dcb178aa1096fa18d1,ce024577400e47196d01d1af1b29801cd29c8af9..e9c5474b8e4a620f26651aebd51a584ee848b727
--- 1/drivers/usb/serial/option.c
--- 2/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@@ -431,14 -427,7 +433,14 @@@ static void option_instat_callback(stru
  #define SAMSUNG_VENDOR_ID                       0x04e8
  #define SAMSUNG_PRODUCT_GT_B3730                0x6889
  
- /* YUGA products  www.yuga-info.com*/
 +/* leadcore LC1808*/
 +#define LEADCORE_VENDOR_ID    0x1ab7
 +#define LEADCORE_PRODUCT_LC1808       0x2200
 +/*展讯模组*/
 +#define SC8800G_VENDOR_ID     0x067b
 +#define SC8800G_PRODUCT_ID    0x2303
 +
+ /* YUGA products  www.yuga-info.com gavin.kx@qq.com */
  #define YUGA_VENDOR_ID                                0x257A
  #define YUGA_PRODUCT_CEM600                   0x1601
  #define YUGA_PRODUCT_CEM610                   0x1602
@@@ -1456,8 -1395,8 +1453,9 @@@ static void option_instat_callback(stru
        int err;
        int status = urb->status;
        struct usb_serial_port *port =  urb->context;
-       struct option_port_private *portdata = usb_get_serial_port_data(port);
+       struct usb_wwan_port_private *portdata =
+                                       usb_get_serial_port_data(port);
 +      static int err_times = 0;
  
        dbg("%s", __func__);
        dbg("%s: urb %p port %p has data %p", __func__, urb, port, portdata);

diff --cc drivers/usb/serial/usb-serial.c
index c4fd197e2bd3eca5c4d266b02126324210d5241b,6f81aa5931825acb831a090b55ec58a89396d9d4..6b715c6fb3f17c958f880a16dbb36365f8089a73
mode 100755,100644..100755
--- 1/drivers/usb/serial/usb-serial.c
--- 2/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c

diff --cc fs/block_dev.c
index 5f58e5ac6a40c995c7cd9e0af5d5f56d05e2c1c8,a580028e2fb81de16bdad67d59fe64d0eec5f038..d6093f91c48cf3d1556b89cef0e479877fdd76e6
mode 100755,100644..100755
--- 1/fs/block_dev.c
--- 2/fs/block_dev.c
+++ b/fs/block_dev.c

diff --cc fs/buffer.c
Simple merge

diff --cc include/linux/mmc/host.h
index 397c8338f2abdca01e454e02866c6e34c1884aa8,f8d1e741d80c4adc058192e961074057d516bb38..3b7d4c5001e91c3358fb79c55bcc6682b857f432
mode 100755,100644..100755
--- 1/include/linux/mmc/host.h
--- 2/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@@ -267,18 -265,9 +267,19 @@@ struct mmc_host 
        const struct mmc_bus_ops *bus_ops;      /* current bus driver */
        unsigned int            bus_refs;       /* reference counter */
  
 +#if defined(CONFIG_SDMMC_RK29) && !defined(CONFIG_SDMMC_RK29_OLD)
 +      unsigned int            re_initialized_flags; //in order to begin the rescan ;  added by xbw@2011-04-07
 +      unsigned int            doneflag; //added by xbw at 2011-08-27
 +      int                     (*sdmmc_host_hw_init)(void *data);
 +#endif
 +
 +      unsigned int            bus_resume_flags;
 +#define MMC_BUSRESUME_MANUAL_RESUME   (1 << 0)
 +#define MMC_BUSRESUME_NEEDS_RESUME    (1 << 1)
 +
        unsigned int            sdio_irqs;
        struct task_struct      *sdio_irq_thread;
+       bool                    sdio_irq_pending;
        atomic_t                sdio_irq_thread_abort;
  
        mmc_pm_flag_t           pm_flags;       /* requested pm features */

diff --cc include/linux/usb/usbnet.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge