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

Conflicts:
	Makefile
	drivers/mmc/core/sd.c
	drivers/net/usb/asix.c
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/b43legacy/main.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/rt2x00/rt2400pci.c
	drivers/net/wireless/rt2x00/rt2400pci.h
	drivers/net/wireless/rt2x00/rt2500pci.c
	drivers/net/wireless/rt2x00/rt2500usb.c
	drivers/net/wireless/rt2x00/rt2500usb.h
	drivers/net/wireless/rt2x00/rt2800pci.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt61pci.c
	drivers/net/wireless/rt2x00/rt61pci.h
	drivers/net/wireless/rt2x00/rt73usb.c
	drivers/net/wireless/rt2x00/rt73usb.h
	drivers/net/wireless/rtl818x/rtl8187/dev.c
	drivers/usb/serial/option.c
	kernel/time/timekeeping.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/compressed/head.S
Simple merge

diff --cc drivers/base/power/runtime.c
Simple merge

diff --cc drivers/mmc/core/sd.c
index e31529c123c5c41a5cecac0a33668a60074fa2b5,08b59b855b05a741e99dabd8df295888d3cd2e0e..2e636377b15687e96e5f427b189a3f053ff0a107
mode 100755,100644..100755
--- 1/drivers/mmc/core/sd.c
--- 2/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@@ -306,9 -306,10 +306,12 @@@ static int mmc_read_switch(struct mmc_c
                goto out;
        }
  
 -      if (card->scr.sda_spec3) {
+       if (status[13] & UHS_SDR50_BUS_SPEED)
+               card->sw_caps.hs_max_dtr = 50000000;
+ 
 +    //mask the the SD Ver3.0 support,modifyed by xbw at 2012-8-09
 +      //if (card->scr.sda_spec3) {
 +      if(0) {
                card->sw_caps.sd3_bus_mode = status[13];
  
                /* Find out Driver Strengths supported by the card */

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/rtc/rtc-twl.c
index 7c766c2e03da7eb48030892a3f7d24a1de2cd20d,5e4e725440accbe03a2f057235766b18dc040fd8..135087efe0ebcc8db4b287a5d38a57ab04de0430
mode 100755,100644..100755
--- 1/drivers/rtc/rtc-twl.c
--- 2/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@@ -459,9 -487,14 +459,14 @@@ static int __devinit twl_rtc_probe(stru
                rd_reg = BIT_RTC_CTRL_REG_STOP_RTC_M;
                ret = twl_rtc_write_u8(rd_reg, REG_RTC_CTRL_REG);
                if (ret < 0)
 -                      goto out2;
 +                      goto out1;
        }
  
+       /* ensure interrupts are disabled, bootloaders can be strange */
+       ret = twl_rtc_write_u8(0, REG_RTC_INTERRUPTS_REG);
+       if (ret < 0)
+               dev_warn(&pdev->dev, "unable to disable interrupt\n");
+ 
        /* init cached IRQ enable bits */
        ret = twl_rtc_read_u8(&rtc_irq_bits, REG_RTC_INTERRUPTS_REG);
        if (ret < 0)

diff --cc drivers/usb/core/hcd.c
index cc8b9c57150a95f8b464a5cc69047a2ce3f025db,9d5af9bb990c835df47caba0c6b6bfa3a4959a22..195733f2333ca25f0be9d15657f1565beb2fcd28
mode 100755,100644..100755
--- 1/drivers/usb/core/hcd.c
--- 2/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c

diff --cc drivers/usb/host/ehci-q.c
Simple merge

diff --cc drivers/usb/serial/option.c
index f16c676b9de1191a578a085645a40e5762014df1,4e0c1183af1dae39604d23d0d3161a30d80c6d94..e9bfcd91b3193263e5ddce883215992d8ca3286d
--- 1/drivers/usb/serial/option.c
--- 2/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@@ -1218,69 -1143,6 +1165,68 @@@ static const struct usb_device_id optio
        { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */
        { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
  
-    { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353) },
 +      { USB_DEVICE(LEADCORE_VENDOR_ID, LEADCORE_PRODUCT_LC1808) },  //zzc
 +      { USB_DEVICE(SC8800G_VENDOR_ID,SC8800G_PRODUCT_ID)},
 +      { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
 +      { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
 +
 +// cmy:
 +      { USB_DEVICE(0x0685, 0x6000) },
 +      { USB_DEVICE(0x1E89, 0x1E16) },
 +      { USB_DEVICE(0x7693, 0x0001) },
 +      { USB_DEVICE(0x1D09, 0x4308) },
 +      { USB_DEVICE(0x1234, 0x0033) },
 +      { USB_DEVICE(0xFEED, 0x0001) },
 +      { USB_DEVICE(ALCATEL_VENDOR_ID, 0x0017) },
 +      { USB_DEVICE(0x1C9E, 0x9E00) },
 +      { USB_DEVICE(0x1C9E, 0xF000) },
 +      { USB_DEVICE(0x19D2, 0x1303) },
 +      { USB_DEVICE(0x19F5, 0x9013) }, // MW100
 +      { USB_DEVICE(0x21F5, 0x2008) },
 +      { USB_DEVICE(0x12D1, 0x1D09) },
 +      { USB_DEVICE(0x04CC, 0x2259) },
 +      { USB_DEVICE(0x04CC, 0x226E) },
 +      { USB_DEVICE(0x04CC, 0x225A) },
 +      { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0015) },
 +      { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7) },
 +      { USB_DEVICE(ZTE_VENDOR_ID, 0xFFFF) },
 +      { USB_DEVICE(LEADCORE_VENDOR_ID, 0x5700) },
 +      { USB_DEVICE(LEADCORE_VENDOR_ID, 0x6341) },
 +      { USB_DEVICE(0x230D, 0x000D) },
 +      { USB_DEVICE(0x0E8D, 0x00A2) },
 +      { USB_DEVICE(0x1E89, 0x1A20) },
 +      { USB_DEVICE(0x12D1, 0x1C05) },
 +      { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0007, 0xff, 0xff, 0xff) },
 +      { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0167, 0xff, 0xff, 0xff) },
 +      { USB_DEVICE(HUAWEI_VENDOR_ID, 0x14A8) },
 +      { USB_DEVICE(0x20A6, 0x1105) },
 +      { USB_DEVICE(0x1EE8, 0x005F) }, // Onda-MSA14.4
 +      { USB_DEVICE(0x0421, 0x061E) }, // Nokia CS-11
 +      { USB_DEVICE(0x0BDB, 0x190A) },
 +      { USB_DEVICE(0x1d09, 0x1010) },
 +    { USB_DEVICE(0x19D2, 0x1181) },
 +      { USB_DEVICE(0x2020, 0x1005)},//S830 3G Dongle
 +// cmy end
 +//xxh
 +   { USB_DEVICE_AND_INTERFACE_INFO(0x05c6, 0x1000, 0xff, 0xff, 0xff) },
 +   { USB_DEVICE_AND_INTERFACE_INFO(0x05c6, 0x6000, 0xff, 0xff, 0xff) },
 +   { USB_DEVICE_AND_INTERFACE_INFO(0x20A6, 0xF00E, 0xff, 0xff, 0xff) },
 +   { USB_DEVICE_AND_INTERFACE_INFO(0x20A6, 0x1105, 0xff, 0xff, 0xff) },
 +   { USB_DEVICE(0x21f5, 0x1101)},
 +   { USB_DEVICE(0x230d,0x0101)},
 +   { USB_DEVICE_AND_INTERFACE_INFO(0x230d, 0x1101, 0xff, 0xff, 0xff) },
 +   { USB_DEVICE(0x2077,0xa000)},
 +   { USB_DEVICE(0x1c9e,0x6061)},
 +   { USB_DEVICE(0x1c9e,0x9605)},
 +   { USB_DEVICE(0x19d2, 0x0170) },
 +   { USB_DEVICE(0x19d2, 0xffe8) },
 +   { USB_DEVICE(0x19D2,0x1177) },//K3770-Z
 +   { USB_DEVICE(0x230D, 0x000c) },
 +   { USB_DEVICE(0x21F5, 0x2009) },
 +   { USB_DEVICE(0x15eb,0x0001)},
 +//xxh end
 +
 +
        { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
        { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
        { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */

diff --cc drivers/video/console/fbcon.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc fs/fuse/dev.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/bluetooth/hci_sock.c
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
Simple merge

diff --cc net/bluetooth/rfcomm/sock.c
Simple merge

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

diff --cc net/ipv6/addrconf.c
Simple merge

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