Revert "fix unknown CPU errors with non-cfX gcc"

This reverts commit 1bfd74b64fb20494460ab778054f47f1eea3a2e9.
arm: compressed: import Makefile from faux123's tuna kernel
Makefile: try faux123's tuna kernel flags
Make wait_for_device_probe() also do scsi_complete_async_scans()

Commit a7a20d103994 ("sd: limit the scope of the async probe domain")
make the SCSI device probing run device discovery in it's own async
domain.

However, as a result, the partition detection was no longer synchronized
by async_synchronize_full() (which, despite the name, only synchronizes
the global async space, not all of them).  Which in turn meant that
"wait_for_device_probe()" would not wait for the SCSI partitions to be
parsed.

And "wait_for_device_probe()" was what the boot time init code relied on
for mounting the root filesystem.

Now, most people never noticed this, because not only is it
timing-dependent, but modern distributions all use initrd.  So the root
filesystem isn't actually on a disk at all.  And then before they
actually mount the final disk filesystem, they will have loaded the
scsi-wait-scan module, which not only does the expected
wait_for_device_probe(), but also does scsi_complete_async_scans().

[ Side note: scsi_complete_async_scans() had also been partially broken,
  but that was fixed in commit 43a8d39d0137 ("fix async probe
  regression"), so that same commit a7a20d103994 had actually broken
  setups even if you used scsi-wait-scan explicitly ]

Solve this problem by just moving the scsi_complete_async_scans() call
into wait_for_device_probe().  Everybody who wants to wait for device
probing to finish really wants the SCSI probing to complete, so there's
no reason not to do this.

So now "wait_for_device_probe()" really does what the name implies, and
properly waits for device probing to finish.  This also removes the now
unnecessary extra calls to scsi_complete_async_scans().

Reported-and-tested-by: Artem S. Tashkinov <t.artem@mailcity.com>
Cc: Dan Williams <dan.j.williams@gmail.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: James Bottomley <jbottomley@parallels.com>
Cc: Borislav Petkov <bp@amd64.org>
Cc: linux-scsi <linux-scsi@vger.kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Remove scsi_wait_scan module

scsi_wait_scan was introduced with asynchronous host scanning as a hack
for distributions that weren't using proper udev based wait for root to
appear in their initramfs scripts.  In 2.6.30 Commit

c751085943362143f84346d274e0011419c84202
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date:   Sun Apr 12 20:06:56 2009 +0200

    PM/Hibernate: Wait for SCSI devices scan to complete during resume

Actually broke scsi_wait_scan because it renders
scsi_complete_async_scans() a nop for modular SCSI if you include
scsi_scans.h (which this module does).

The lack of bug reports is sufficient proof that this module is no
longer used.

Cc: Jeff Mahoney <jeffm@suse.de>
Cc: Dave Jones <davej@redhat.com>
Cc: maximilian attems <max@stro.at>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Fix trace compiler warning
defconfig: enable some tracing

I'm not sure if I'll need these. Just picked the changes from Andromadus so I don't have to re-find them in case they prove to be needed at some point.
drivers: synaptics_3k: poke it with a stick

I've no freaking idea what these do but after a quick test, didn't break anything either.
Revert "drivers: synaptics_3k: poke it with a stick"

This reverts commit 501ca7b50f69c9f58abf7a64d7f246626d299bef.
Revert "Revert "Updated htc_headset drivers""

This reverts commit 5f61948f8405c6e13be5a5ba6f6770f65a4f5fba.
htc: remove 35mm bitmask @Kali-

this is an ugly hack needed to get headset recognized by f/b
as on ICS HeadsetObserver was converted to a more generic
WiredAccessoryObserver and do not like the htc 35mm bitmask

Change-Id: I97871da1430e54bae607ec639072f1c1c73bc0b5
Remove ONMODE_CHARGING

Change-Id: I823499e222ee58550ed11f9c86753818a1f9637c

Conflicts:
	arch/arm/mach-msm/include/mach/msm_fb-7x30.h
	drivers/video/msm/msm_fb.c
remove HTC_NETWORK_MODIFY

Change-Id: Id3bd3183687d56352d43dcc0981d1e94b6c1bb1a

Conflicts:
	arch/arm/configs/vision_cm9_defconfig
	arch/arm/configs/vision_defconfig
	arch/arm/configs/vivo_defconfig
spade: set out_strength in pm8058_gpios_init (elginsk8r)

glacier commit: https://github.com/Evervolv/android_kernel_htc_msm7x30-3.0/commit/88d04f8924c1021b0d808185386b58222353c9e4
qup_i2c: Calculate combined write length for multiple write transactions

When a transaction consists of multiple write requests, add up the total
length of the write requests.  If there is a read following the writes,
set the read mode appropriately.

Change-Id: I0c15e14fa4732e4e25f5bb885688662a066b8782
Signed-off-by: Kenneth Heitke <kheitke@codeaurora.org>
qup_i2c: Fix for multiple write transactions

When a transaction consists of multiple write requests, combine them
only when the addresses of the writes are the same.

Change-Id: I35089d7b3936acf2de28f075734da84069b83fb3
Signed-off-by: Harini Jayaraman <harinij@codeaurora.org>
qup_i2c: Recovery mechanism for GSBI when slave pulls line low

If slave pulls one of the I2C lines low,I2C bus may lock out
failing I2C transactions for all slaves on the GSBI.
Recovery mechanism is added to recover the I2C lines when this
happens. Also, we allow clients to retry when a connection error
is returned.

Change-Id: I12675d828d0880ded292724416b5407427cdf73c
Signed-off-by: Harini Jayaraman <harinij@codeaurora.org>
qup_i2c: Enabling CORE_ON_EN bit while disabling the QuPE PCLKs

To disable the GSBI QuPE PCLKs it is important to enable
the CORE_ON_EN bit for some targets like 7x27a.

CRs-Fixed: 302634
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>
(cherry picked from commit f0274f1eee416ac0e363e3dfd74c231722673fd1)

Change-Id: I4848a2f2d0eaae5787bdb6614a100011b45db2cb
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>
qup_i2c: remove TEST_RECOVERY

Change-Id: I54a009ee268a7e1073e52ffc072a57363d52ebf9
i2c: msm: modify I2C msm driver code to use new clock APIs

Replace the existing clock APIs in I2C msm driver
with new APIs.

CRs-Fixed: 366705
Change-Id: I7661c6a9218f37f5cb694e1e3801daeef46fc74c
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>