Revert "yaffs: Update stats when using mtdif2."

This reverts commit a660ce8105791a9ef6b4cf4836cac073c8736442.

Revert "yaffs: Fix yaffs_file_write to not return -ENOSPC when there is nothing to write"

This reverts commit 567940aa0a576440a6f64b8bb2517c378f6b6886.

Revert "yaffs: Import yaffs from Wed Sep 9 03:03:01 2009 +0000"

This reverts commit 02a5a91a76ef89c9444cc04c309547f3be55cdc5.

Revert "yaffs: Don't update page read and write counts from yaffs_mtdif2."

This reverts commit 4698f1ee43795d9b4b2c6a91c84e000c9bfee21b.

Revert "Fix yaffs checkpoint out of space crash"

This reverts commit 8ff4860c2778c0be92a63808036de337d13fa864.

Revert "Add handling for unrooted files"

This reverts commit 75e82381df19bcb8bf6681f3fe1a2a8360e6cddc.

Revert "yaffs: Fix readdir hang."

This reverts commit ef330d560d9c3bb66ab1031af243b3171bba219f.

Revert "yaffs: Better control over rename shadowing"

This reverts commit 703932d07237252c0aca76ab693463664f0a71a3.

Revert "cgroup: Add generic cgroup subsystem permission checks."

This reverts commit 5038d42d2e60c855cf5b097197d95adaa1269d32.

Revert "net: add PPP on L2TP Access Concentrator (PPPoLAC) driver."

This reverts commit dbdb1c32784d0145fe545410e9771070e5dc702b.

Revert "net: add PPP on PPTP Network Server (PPPoPNS) driver."

This reverts commit 7cc7c63e6272d939b82bbd6a3d081ed774f35ee2.

Revert "net: PPPoPNS and PPPoLAC fixes."

This reverts commit 286fcd1c1ed0003ba2bdbd26d1ffbe66f5980c85.

Revert "security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable()."

This reverts commit c30cd45aad4538d9433d691e62635ef8e2bcffaa.

Revert "net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW)."

This reverts commit f9193a728ae53bf17792f3eebad07f89c2166c73.

Revert "Revert "printk: remove unused code from kernel/printk.c""

This reverts commit afa82e25d4d6ab6500828cd7cc9d395a9c1e5d69.

Revert "printk: Fix log_buf_copy termination."

This reverts commit 8a3025c963926f1cc36b15f6b95b9da0c1ab1cdf.

Revert "kernel_debugger_core: add interrupt-context debugger core"

This reverts commit 25049b34a868c08147f8eca23d64945f74de0715.

Revert "wl127x-rfkill: Add power control driver for TI WL127X Bluetooth chips"

This reverts commit 6adc27186cf59e8d50e96f6873002f081ee2d111.

Conflicts:

drivers/misc/Kconfig
drivers/misc/Makefile

Revert "rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down"

This reverts commit 3431d2fb2dc6e731081e1b7203953b63fe5ad373.

Revert "serial_core: Add wake_peer uart operation which is called before starting UART TX. The idea here is to provide a mechanism where we can wakeup our peer before sending data."

This reverts commit f5353976c6a13732718b472ad308af1bb997f025.

Revert "Bluetooth: Do not attempt to send dlci disconnect when in BT_CONFIG."

This reverts commit 8a4424765e8daaf56a2d8a0e0ab9dfcf859879fa.

Revert "Bluetooth: Fallback from eSCO to SCO on error code 0x1a (unsupported feature)."

This reverts commit 8787099ec0143e0973165b3d9b0a88525a738639.

Revert "Bluetooth: Increase timeout for legacy pairing from 10 seconds to 40 seconds."

This reverts commit 1f39bbdd42999892f5f6ef8aeb03b3fff6d1ebd6.

Revert "Bluetooth: Do not call rfcomm_session_put() due to RFCOMM UA on closed socket."

This reverts commit 43a3de3be869aa4417817b94b7dde35267951418.

Revert "Bluetooth: Fallback to SCO on error code 0x10 (Connection Accept Timeout)."

This reverts commit df28bc9c1957170dbf796063853a4a1aee1af6ac.

Revert "Bluetooth: Enter active mode before establishing a SCO link."

This reverts commit 8fd3238575a5410507846838dbb2d4553f3f5aa2.

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