marimba_profile_ariesve.h: corrected compilation warnings
dir.c: Corrected compilation warnings
fs/fat/dir.c:43: warning: 'de' may be used uninitialized in this function

The complexity of the code flow makes this seem possible.  Initialize
the value to NULL to eliminate the compiler warning.  This only masks
the warning, since if the value were unused, there would still be a
NULL pointer.

Signed-off-by: David Brown <davidb@codeaurora.org>
xt_log.h: corrected compilation warning
xt_log.h:50: warning: value computed is not used
fsa9480.c: corrected compilation warning
drivers/i2c/chips/fsa9480.c: In function 'fsa9480_i2c_tx_data':
drivers/i2c/chips/fsa9480.c:286: warning: ISO C90 forbids mixed declarations and code error
fsa9480.c: corrected compilation warnings
some warnings: ISO C90 forbids mixed declarations and code error
some warnings: 'return' with no value, in function returning non-void
funtion: fsa9480_chip_init
warnings: large integer implicitly truncated to unsigned type

line 585: warning: 'return' with no value, in function returning non-void
line 627: warning: ISO C90 forbids mixed declarations and code (no init variable declared)

line 1395: warning: initialization from incompatible pointer type
Fix line 1395: I created its proper function "fsa9480_shutdown" equal to "fsa9480_remove"
cypress-touchkey.c: corrected compilation warnings
warning: function declaration isn't a prototype
in line 198, 357

588: warning: format '%d' expects type 'int *', but argument 3 has type 'u8 *'
967: warning: label 'err_backlight_on' defined but not used
1021: warning: unused variable 'retry'
Corrected compilation warnings
ancora_tmo: Fix vibrator

Not 100% sure since I can't test it personally.
Add audio sleep mode code from stock kernel
msm_fb: display: Use rgb8888 logo routine from newer Samsung kernel
Ancora panel uses different clk table
Use gpio config code from stock kernel
Log SMSM states
Remove more stuff from old kernel
usb: gadget: android: Reset next_string_id before enable

Reset next_string_id to 0 before enabling the gadget driver. Otherwise,
after a large number of enable/disable cycles, bind will fail
because we cannot allocate new string ids. String ids cannot be larger
than 254 per USB spec.

Change-Id: I44f5fece45008b7a0a18c025d4eb5ce842585c28
Signed-off-by: Benoit Goby <benoit@android.com>
Bluetooth: Keep master role when SCO or eSCO is active

This improves compatbility with a lot of headset / chipset
combinations. Ideally this should not be needed.

Change-Id: I8b676701e12e416aa7d60801b9d353b15d102709
Signed-off-by: hyungseoung.yoo <hyungseoung.yoo@samsung.com>
Signed-off-by: Jaikumar Ganesh <jaikumarg@android.com>
ARM: idle: call idle notifiers before stopping nohz tick

If an idle notifier modifies a timer, calling the notifier after
the sched tick has been stopped may leave the sched tick set too
early.  Move teh idle notifier call before the call to
tick_nohz_stop_sched_tick.

Change-Id: I0db3284bec6d0193bc5e2a57650ab06bd8342319
Signed-off-by: Colin Cross <ccross@android.com>
usb: gadget: android: Cancel pending ctrlrequest before disabling

Make sure there is no pending ctrlrequest before removing the config.
Otherwise the ctrlrequest complete callback could access structures
after they have been freed. Unbind cancels pending transfers but not
ep0 requests.

Bug: 5513065 5440193

Change-Id: I063c22bf5d104a3d2df71cf622409459fac5f27a
Signed-off-by: Benoit Goby <benoit@android.com>
usb: gadget: android: Don't allow changing the functions list if enabled

Change-Id: I3ad39b420ce79a8602a7eca1daac1f56b30bad5c
Signed-off-by: Benoit Goby <benoit@android.com>

Conflicts:

	drivers/usb/gadget/android.c
Revert "usb: gadget: rndis: don't use dev_get_stats"

This reverts commit ffdab0c0c40bab6de78b1952bb07aed221994b73.

Not needed anymore in 2.6.39 and 3.0, dev_get_stats has been fixed
and may be called from atomic context. See:
1ac9ad1 net: remove dev_txq_stats_fold()