Revert "Bluetooth: Add ACL MTU, available buffers and total buffers to hci_conn_info."

This reverts commit 7b75ff3c3f0b0014dd22c1db05ca916cd4b886e8.

Revert "Bluetooth: Introduce L2CAP_LM_FLUSHABLE to allow flushing of ACL packets."

This reverts commit d7897fd1e9fb3a5df0740dc2dc45ec94ca0965f2.

Revert "Bluetooth: Hack: Do not use power_save feature."

This reverts commit c09426ea439387637204ccebafd6cd7f02065e62.

Revert "drivers: power: Add watchdog timer to catch drivers which lockup during suspend."

This reverts commit d20c38c796134b43b46dc97faf9d09d3df437041.

Conflicts:

drivers/base/power/main.c

Revert "mtd: nand: Add naieve panic_write support for generic nand devices."

This reverts commit a431be40b097bb30ac0766b46364c041f99a9e11.

Revert "[ARM] process: Add display of memory around registers when displaying regs."

This reverts commit 4992adfafb41fc41427935911378210ac3243229.

Revert "kernel: printk: Add non exported function for clearing the log ring buffer"

This reverts commit 90bb75ece868932904865ea46e61b78e5a987224.

Revert "proc: smaps: Allow smaps access for CAP_SYS_RESOURCE"

This reverts commit 5c438f06fd4a07cad15cd6b59da4036f62efd990.

Revert "drivers: apanic: Android kernel panic handler."

This reverts commit 4360c491027cc03cb055b9d1781e5c41b2f1cdd5.

Conflicts:

drivers/misc/Kconfig
drivers/misc/Makefile

Revert "ramconsole/apanic: Ensure ramconsole does not get cluttered by apanic threads"

This reverts commit 05ec8148bda5d0206e82eba2357138cc9f02705b.

Revert "misc: apanic: bad block handling"

This reverts commit 03d778875b93d95217990e3e420252a2ed7fa3a8.

Revert "misc: apanic: erase kpanic when no data"

This reverts commit b4c785a83a24830838f3293ff3e8ff5354509a66.

Revert "Staging: android: ram_console: Start ram console earlier"

This reverts commit 1d2b49700cbcfb109e2cfb0e6003e1c77370b5ce.

Revert "Staging: android: timed_gpio: Request gpios."

This reverts commit 6bb28b20afd42640ea80bcaabe4c24c3a8fe87e1.

Revert "cpufreq: ondemand: Don't synchronize sample rate unless mulitple cpus present"

This reverts commit beb070f3d41fb82c69c6dcec1293817c7c788d10.

Revert "block: genhd: Add disk/partition specific uevent callbacks for partition info"

This reverts commit f9d6d7703fca9b9d5d92c6e71ed4263220059884.

Revert "HACK stay compatible with the emulated TLS register HACK"

This reverts commit 197d3f06e732a0428701c4f3550b91f9fc1297ab.

Revert "pca963x: Phillips PCA963X 4-bit i2c led driver"

This reverts commit 24152b5a73c80ab1b5c75e712cfbb9fd7f61815b.

Revert "mmc: core: Release delayed mmc work wakelock after deep disable"

This reverts commit e4adc653748af0499f30809e47764bee6563e53f.

Revert "disable staging/dream"

This reverts commit 1d69bc989dc640d17e966818936e30698f243790.

Revert "USB: composite: Add class driver for enabling and disabling USB functions."

This reverts commit f8cf7f90ac799df1f9a34bd7cd6fb0dce063c8c5.

Revert "USB: android: Use composite class driver for enabling and disabling functions"

This reverts commit 65eb4c8d6eecf6f3637efed5be8ab31adf1452ff.

Revert "USB: gadget: Disable RNDIS function by default if CONFIG_USB_ANDROID_RNDIS is set"

This reverts commit cb7536857381c2eb10ecb4c1d14d2ef274baa75c.

Revert "USB: gadget: android: Specify USB_CLASS_COMM in device descriptor if using RNDIS"

This reverts commit 60701f4d86d51c040ce4c38f44e2e1535c164a9f.

Revert "USB: composite: Compute interface numbers correctly when functions are hidden."

This reverts commit a3fccf6a0e53be3bff36f5c83d43b02fa7a629aa.

Revert "USB: gadget: android: Fix special case for RNDIS ethernet function"

This reverts commit 316525238a92d521456f389969b24adafc44c2e2.

Revert "mtd: nand: Allow NAND chip ids to be included standalone."

This reverts commit 0a39ec04c518d367d599db2edf1273edb5e2125e.

Revert "Add USB_ANDROID_RNDIS_WCEIS option."

This reverts commit aace891ed58b0081b0207debb517567a499b50ed.

Revert "Revert "Bluetooth: Fix rejected connection not disconnecting ACL link""

This reverts commit ce1c698ea8a242f386d03f236fac1af4f0e83495.

Revert "usb: gadget: u_ether: Remove warning from gether_disconnect()"

This reverts commit 980bfabc06ae4d0db1092784c40657f2173edefe.

Revert "power: wakelock: Print active wakelocks when has_wake_lock() is called"

This reverts commit 7175b7585f84bb8e7de5f6a1e694c3275377cecb.

Revert "vmalloc: remove BUG_ON due to racy counting of VM_LAZY_FREE"

This reverts commit 21ba0cac4b63286aaf41befb3b93c8ffb5036306.

Revert "android: logger: Add new system log for framework/system log messages"

This reverts commit ae991396e9c66ca7bb73fceb62e632ff4ed6c4e0.

Revert "USB: gadget: android: Disable UMS when RNDIS ethernet is active."

This reverts commit a8d5021410094d76f4b6003b67ec5ab1d33a6ec6.

Revert "Revert "Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP""

This reverts commit 33a3a31ffafc73c537e4a99c99da766863cc9d41.

Revert "Revert "Bluetooth: Change RFCOMM to use BT_CONNECT2 for BT_DEFER_SETUP""

This reverts commit e7e66e1a05730d61f5e009208de6848a8de717f7.

Revert "Bluetooth: Allow SCO/eSCO packet type selection for outgoing SCO connections."

This reverts commit 3b077241e02041b1f03fee912896b8de1d7ac096.

Revert "USB: gadget: composite: Don't call set_alt() on functions that are hidden."

This reverts commit 6fd76fd99efabcc28ca58d32257a608be22e1019.

Revert "USB: gadget: composite: Don't increment interface number for alt settings."

This reverts commit b1d4000fe60cec6a05fd09b7a6697ede7ab649a2.

Revert "pmem: Add cache flush ioctl for pmem buffers"

This reverts commit f6320db51173e3b94f54b87944b88d3b363c4487.

Revert "Revert "Bluetooth: Introduce L2CAP_LM_FLUSHABLE to allow flushing of ACL packets.""

This reverts commit 71682ea19f8d5d96034ce113acbbf83ac58173e6.

Revert "Bluetooth: Use non-flushable pb flag by default for ACL data on capable chipsets."

This reverts commit a47633bdbcc9b87f2a72e9bdf317f05e2e6c8051.

Revert "USB: gadget: f_rndis: Add platform data for RNDIS vendor ID and MAC address."

This reverts commit 7dc693330c1fda407643b95c876fc072845c0593.

Revert "Revert "sysfs: Fix sysfs owner and group.""

This reverts commit dc136618cb23810dd3d4adfcb836b289cd528b4f.

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

This reverts commit 67078ecae3edb5b4657dcb9f67f744ecccd18a97, reversing
changes made to dc136618cb23810dd3d4adfcb836b289cd528b4f.

Conflicts:

drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/eeprom.c
drivers/net/wireless/ath/ath5k/eeprom.h
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/mac.c
drivers/net/wireless/ath/ath9k/mac.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/reg.h
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/b43/b43.h
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/rfkill.c
drivers/net/wireless/b43legacy/rfkill.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000-hw.h
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-eeprom.c
drivers/net/wireless/iwlwifi/iwl-eeprom.h
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwmc3200wifi/iwm.h
drivers/net/wireless/libertas/scan.c
drivers/net/wireless/libertas/wext.c
drivers/net/wireless/orinoco/wext.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rtl818x/rtl8187.h
drivers/net/wireless/rtl818x/rtl8187_dev.c
drivers/net/wireless/rtl818x/rtl8187_rfkill.c
drivers/usb/serial/option.c

Revert "USB: gadget: f_mass_storage: Flush writes after every 4 MB."

This reverts commit 5cf1b82507ed24e0ee9f4f2f3ce6dbcb82b86fa0.

Revert "apanic: make APANIC_LABEL depend on APANIC"

This reverts commit 00dc766f6644f2d1b0b05b80112bb4f94339e168.

Revert "USB: gadget: android: check for null _android_dev in android_register_function()"

This reverts commit 4bcc593ad967fd7ff1c30f61cb6ea5dc91b8c1a0.

Revert "wlan: Extract generic wlan platform data from tiwlan specific header"

This reverts commit 275f83d836c2bbb13288eaa822c2e833e0e02e38.

Revert "proc: pagemap: Hold mmap_sem during page walk"

This reverts commit 0bf551684025a5f0f3c9aac694cd5cf73706cb70.

Revert "USB: gadget: android: mass_storage: Use spin_lock_irqsave/spin_unlock_irqrestore"

This reverts commit 3274abc33ec2c170acd6fd2732c271ad9dd0b17f.

Revert "Bluetooth: Hack: Don't dereference null pointer."

This reverts commit 612cd5aa166a6f22660ebd104a08a40576c44a36.

Revert "fs: partitions: Fix warnings in fs/partitions/check.c"

This reverts commit e27f17b5318851395a66cbaf1524ea89ff8f0cb9.

Revert "USB: gadget: f_mass_storage: Defer handling interface changes until it is safe."

This reverts commit 0fc7f96b5be344f7a5499e29b30f245fb857f4a2.

Revert "Staging: android: timed_gpio: Properly discard invalid timeout values."

This reverts commit a7f5cb901df253cb3aed7a369298a95703cc5995.

Revert "Revert "proc: pagemap: Hold mmap_sem during page walk""

This reverts commit 2c07d75caea45852bb9a58648a6be476ffc57a02.

Revert "proc: pagemap: Hold mmap_sem during page walk"

This reverts commit 49ff3070f5ecc45ce45cc4e840cd0f20b768e3d3.

Revert "Staging: android: binder: Create dedicated workqueue for binder deferred work"

This reverts commit 64fa454e9d4dc650553eaf1bfb2d8ef75c6a3ee6.

Revert "lowmemorykiller: Don't try to kill the same pid over and over"

This reverts commit 65c9eb5fc0e3834475c6d749a75ba17261ac1d1a.

Revert "USB: android gadget: mass storage: Fix format issue for Vista Host"

This reverts commit fd515513a38b53d2b961cbbc9c4fdaeedec74d44.

Revert "[ARM] Do not call flush_cache_user_range with mmap_sem held"

This reverts commit 7bc14acfbb86b00a93ddb1c40d9d2050cd7188fe.

Revert "staging: android: lowmemkiller: Substantially reduce overhead during reclaim"

This reverts commit 3508951576473670d90e65562a9140d8dff93386.

Revert "binder: Fix memory corruption via page aliasing"

This reverts commit 6bdee543a3281e7d53e2902fedae529ced5e0c7e.

Revert "sched: Add a generic notifier when a task struct is about to be freed"

This reverts commit 9e6cb2f4dbe36af72558f60f418cc03df0173628.

Revert "staging: android: lowmemorykiller: Fix task_struct leak"

This reverts commit 896c969afc251e0525e28633c57e4e0a97229dd6.

Revert "staging: android: lowmemorykiller: Remove bitrotted codepath"

This reverts commit ab24f9c8fd996759bc16cfaf496c26c461758009.

Revert "Implement read(2) in ashmem driver"

This reverts commit 16fe6f1aa71cbfafed933c220cdaf1a0bad09980.

temp revert timed_gpio change

Revert "Merge remote branch 'common/android-2.6.32' into develop"

This reverts commit 5091b83839ca4ba4f6cb70eb461b35ffb15b8fb3, reversing
changes made to 0fd331518d0898229e9e6747c636c3978028e7f0.

Revert "Merge remote branch 'common/android-2.6.32' into develop"

This reverts commit c7e039e278f094a51d706b217cfdb92a7bfb37a6, reversing
changes made to d00e5f74ae65f54f401f66efea3d734b6b136cab.

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

This reverts commit 6e2688ca848b14639c6ce07ec87c51fdc1742b61, reversing
changes made to 4b7c9de4deb80eb1e1b154112a5e6cb2d3d79f96.

Conflicts:

drivers/gpio/wm831x-gpio.c
drivers/i2c/busses/Kconfig
drivers/net/dm9000.c
drivers/net/wireless/airo.c
drivers/net/wireless/ath/ar9170/hw.h
drivers/net/wireless/ath/ar9170/main.c
drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/ath/ath5k/ath5k.h
drivers/net/wireless/ath/ath5k/attach.c
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath5k/qcu.c
drivers/net/wireless/ath/ath5k/reset.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/beacon.c
drivers/net/wireless/ath/ath9k/eeprom.h
drivers/net/wireless/ath/ath9k/eeprom_def.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/initvals.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/pci.c
drivers/net/wireless/ath/ath9k/phy.h
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/ath/regd.h
drivers/net/wireless/b43/Kconfig
drivers/net/wireless/b43/Makefile
drivers/net/wireless/b43/b43.h
drivers/net/wireless/b43/dma.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/pio.c
drivers/net/wireless/b43/pio.h
drivers/net/wireless/b43/xmit.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/hostap/hostap_cs.c
drivers/net/wireless/hostap/hostap_hw.c
drivers/net/wireless/hostap/hostap_pci.c
drivers/net/wireless/hostap/hostap_wlan.h
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-helpers.h
drivers/net/wireless/iwlwifi/iwl-rx.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/libertas/if_sdio1.c
drivers/net/wireless/p54/eeprom.c
drivers/net/wireless/p54/p54pci.c
drivers/net/wireless/p54/p54usb.c
drivers/net/wireless/p54/txrx.c
drivers/net/wireless/rndis_wlan.c
drivers/net/wireless/rtl818x/rtl8180_dev.c
drivers/net/wireless/wl12xx/wl1251_debugfs.c
drivers/net/wireless/wl12xx/wl1251_sdio.c
drivers/usb/serial/option.c
net/bluetooth/rfcomm/core.c

temp revert msdos change

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

This reverts commit 84aa38e58d1115f2562cdbed32c57ed9a6e460e8, reversing
changes made to 9505d021e0c4e93eb854ae380529c04c81ddcf6f.

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

This reverts commit 7cd3739f32f642e2bdd722b253abbc4318202002, reversing
changes made to 2748ae2cc2276d238e1d0d54b739fa1009fd94ad.

Conflicts:

drivers/usb/core/hub.c
drivers/usb/serial/option.c

temp revert mmc change

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

This reverts commit 2caa51d22aaf6dd05475ebb7b67bf0de29cbb9af, reversing
changes made to cc88c1f62a752f6e7948c763fde38e12d6a30a22.

Revert "delete pmem ioctl information"

This reverts commit 04f2d6f3c101abab9c48430ad77e0a9f44addf5a.

Revert "rk29: call resume_console while dpm_drv_timeout, make debug more easy"

This reverts commit 1c209c256f686d8e5d806f48ebbe029f4545df8a.

Revert "ASoC: core: On resume also check the soc device state"

This reverts commit ecf7611caeb1b68e6ed4575f1abf92c619e75a98.

Revert "clocksource: Provide a generic mult/shift factor calculation"

This reverts commit cfc80b68293040b1f06c1fb388d3bd448721aa7b.

Revert "Fix rounding in clocks_calc_mult_shift()"

This reverts commit 2455208a7a55d588bcd081b54eacfcc7574356d9.

Revert "lib: add support for LZO-compressed kernels"

This reverts commit 3a3ba0241af46826678fd92ee0276150300b1f80.

Revert "arm: add support for LZO-compressed kernels"

This reverts commit c418f3acd26f289b11b043378656e1d000d97f87.

Revert "timer: Added usleep_range timer"

This reverts commit 18464b0b7575266595c3a1b8e0aab9198033b85e.

Revert "clockevents: Use u32 for mult and shift factors"

This reverts commit b7ad2a012ab29b9c7ebf9679b0b69a41165abc48.

temp revert alarm change

temp revert yaffs change

temp revert usb gadget change

temp revert usb serial option change

temp revert apanice change

temp revert wakelock change

net: usb: refactor for 2.6.36

wm8994:fix a bug on calling pop noise

camera:fix ov5640 flash complite error

fb: fix fb rotate bug

bq27541 board

Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop

add bq27541

rk29: clock: default codec pll rate set to 297MHz

rk29phonesdk:touch screen->modify gt818 driver to fit the new touch screen panel