[AUTO-REBASE-FULLOG] UNATTENDED

[Lee Jones]

Fetching mainline
Fetching igloo_kernel
Fetching glo-working

============================================================================================
Rebasing tracking-igloo_kernel-audio onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-audio

First, rewinding head to replay your work on top of it...
Applying: misc: Add audio_io_dev driver
Applying: misc: Add i2s driver
Applying: spi: add stm msp driver
Applying: sound: add ab8500 audio codec
Applying: mach-ux500: add msp board file
Applying: sound: add alsa support for ab8500
Applying: sound: add asoc support for ux500 platform
Applying: sound: add asoc codec support for ux500 platform
Applying: Ux500 ASoC: Support for multi-channel audio in AV8100 codec-driver.
Applying: msp: remove usage of stm_gpio_altfuncenable/disable
Applying: Ux500 ASoC: Use of cyclic DMA.
Applying: Ux500 ASoC: Multi-component support.
Applying: Ux500 ASoC: Fix for for audio capture.
Applying: Ux500 ASoC: Allow multiple prepares.
Applying: Ux500 ASoC: Support for MSP3.
Applying: msp: improved configuration for msp1
Applying: sound/soc: Add the AB5500 codec driver and correct the MSP internal clock frequency.
Applying: mfd: Updating sound/soc/codecs/cg29xx.c for community
Applying: Ux500 ASoC: Change debug-level to avoid log-spam.
Applying: ASoC: Add support for AB8500 audio
Applying: Update AB8500 ASoC mixer controls
Applying: Enable headset mic on V2 HW
Applying: Ux500 ASoC: Fix 7 and 8 channel playback for AV8100
Applying: Ux500 ASoC: Fix IF delay issue with AV8100
Applying: sound accessory: update taken from 2.6.35 GLK
Applying: sound: fix DAPM API change in 2.6.38
Applying: sound: replace init_MUTEX() by sema_init() and fix MODULE_LICENSE for 2.6.38
Applying: mach-ux500: delete SSP PrimeCell ID
Applying: msp: Fix warnings
Applying: i2s: Remove DMA cyclic from i2s, temporary hack
Applying: Input: Add AB8500 AV Acc. Detection as platform drv
Applying: I2S/DMA: Code cleanup
Applying: Ux500 ASoC: Adaptations in the AB8500-parts for U8500.
Applying: Ux500 ASoC: Naming alignments and __devinit and __devexit fix.
Applying: ux500 MSP: Set SLPM for GPIO pins used by MSP1
Applying: Ux500 ASoC: The MSP DAI driver now implements set_sysclk.
Applying: ASoC: cg29xx: The driver will not start a BTSCO stream.
Applying: Ux500 ASoC: Support configuration of I2S interface 1
Applying: Ux500 ASoC: Add support for burst-mode
Applying: Ux500 ASoC: Fixed register defines for AB8500 codec-driver.
Applying: Ux500 ASoC: Fix build-error for AV8100 codec-driver
Applying: Ux500 ASoC: Dynamical mapping of AD to slot settings
Applying: Ux500: Audio: AB8500 v3.x was wrongly handled as v1.x.
Applying: Ux500 ASoC: Take sysclk during audio-playback
Applying: Ux500 ASoC: Added reference counter for sysclk
Applying: Ux500 ASoC: Turn off AB8500 when inactive
Applying: Ux500 ASoC: Move enabling of regulators
Applying: Ux500 ASoC: cg29xx: The I2S PCM interface must not be configured
Applying: misc/i2s: OPP100 in MSP master-mode only
Applying: Audio: Add support of ULPCLK in audioio driver
Applying: Ux500 ASoC: Dynamical mapping of DA from slot settings
Applying: mach-ux500: gpio: audio: Moved the NOMADIK_NR_GPIO
Applying: sound: soc: ux500: Fix merge problems
Applying: sound: soc: codec: Fix link warnings
Applying: ux500-ASoC: Change to support ux500 soc:s in build
Applying: ux500-ASoC: Update ux500 driver to use dmaengine
Applying: msp i2s: Don't enable regulator for msp1 and msp3
Applying: Ux500 ASoC: Dynamic audio master-clock select
Applying: Ux500 ASoC: Reflect changes in clock-db8500.c
Applying: Ux500 ASoC: Add controls for negative charge pump
Applying: arm: ux500: common dbx500 prcmu driver api
Applying: sound: u8500: msp: Remove v1 support
Applying: Ux500 ASoC: Add codec-driver for AB5500
Applying: Ux500 ASoC: Add controls for sidetone in AB8500
Applying: Ux500 ASoC: Enhanced regulator management
Applying: Ux500 ASoC: Print-level changes
Applying: cg2900: sound: fixes due to move cg29xx driver in staging
Applying: mach-ux500: audio: Fix for gpio header move
Applying: ux500: sound: Withdraw some console traces
Applying: Ux500 ASoC: Fix ALSA-controls for sidetone FIR
Applying: Ux500 ASoC:DistortionNoise fix for underrun AB5500
Applying: u5500 : Improper handling of device name in ab5500 core
Applying: misc: fix the indentation of i2s driver
Applying: ux500: mop500: force SD/MMC and MSP2 TX onto different channels
Applying: Ux500 ASoC: Add codec-driver for AB5500
Applying: Ux500 ASoC: Add codec-driver for AB5500
Applying: Ux500 ASoC: increase volume level of mic
Applying: video: av8100: Add new firmware version
Applying: ab5500: move to separate header
Applying: Ux500 ASoC: Activate gpio.1 clock during playback
Applying: Ux500 ASoC: Fix problem when disabling DMics
Applying: Ux500 ASoC: Proper handling of vibra output driver
Applying: Ux500 ASoC: Cosmetic changes
Applying: Ux500 ASoC: Fix FIR-coeffecient limit
Applying: Ux500 ASoC: Remove analog loopback graph from DAPM
Applying: u5500: Enable Sound on HDMI
Applying: Ux500 ASoC: Move mic-regulators into DAPM-paths
Applying: Ux500 ASoC: Fix to set max/min in h/w setting
Applying: sound: asoc: ab5500: Fix to set correct DAI format
Applying: Ux500 ASoC:To decrease noise in Audio playback
Applying: ARM: ux500: sound: Replace mach prcmu driver with mainlined version
Applying: sound: pcm: ux500 porting to 3.1
Applying: sound: asoc: ab5500: Corrected the clock setting
Applying: SOC CG29xx: Fix bit-clock to receive FM over I2S
Applying: ASOC CG29xx: Configure Codec to receive FM
Applying: ASOC CG29xx: Configures driver cg2900 for FM
Applying: ASoC: Ux500: Added support for Line Out
Applying: ASoC: Ux500: Power toggle moved to DAPM
Applying: misc: audio_io: Remove obsolete and unused driver
Applying: misc: Compile sound specific misc drivers
Applying: sound: Include module.h after 3.2 update
Applying: sound: ab8500: Fix bad enum declaration
Applying: Ux500 ASoC: Add new generic ALSA Control types
Applying: Ux500 ASoC: Add ANC functionality
Applying: Ux500 ASOC:To enable codec as master
Applying: audio: ux500: Coding style fixes
Applying: ASoC: Ux500: Power toggle moved to DAPM re-visited
Applying: Ux500 ASOC: Correct faulty MSP settings
Applying: ASoC: Ux500: Fixed name convention errors
Applying: ASoC: Ux500: Dynamic setting of HDMI Coding Type in AV8100
Applying: Ux500 ASoC: power_lock was not properly released
Applying: Ux500 ASOC:fix incomplete reversal on AB master
Applying: ASoC: Ux500: Fix DPGA2 gain register usage
Applying: ASoC: Ux500: Remove static gain setting in AB
Applying: ASoC: Ux500: Remove static route in AB
Applying: ASoC: Ux500: Proper power on sequence for playback
Applying: Ux500 ASoC: Only turn off regulator on error
Applying: Ux500 ASOC:Enable codec as master for 5500
Applying: ASoC: Ux500:use framework to support mic regulator
Applying: ASoC: Ux500: Fix TX register shift value
Applying: misc: i2s: Speedup playback init sequence
Applying: misc: Remove obsolete header file
Applying: ASoC: cg29xx: Configuration for BTVoicecall.
Applying: ASoC: Ux500: Put back bit-delay for AV8100-codec
Applying: ASoC: Ux500: Audio driver not requesting for clocks it uses
Applying: ASoc:Ux500 AB5500 CODEC clock always enabled
Applying: ASoC: Ux500: Add api for unsupported hs detect
Applying: ASoC: Ux500: Move i2s into ASoC and remove old i2s-layer
Applying: ASoC: Ux500:Use regulator framework control BIAS2
Applying: ASoC: Ux500: Add support for mapping reg to amic
Applying: ASoC: cg29xx: Configuration for FM.
Applying: audio: i2s: msp_i2s driver porting on 3.2
Applying: sound: ux500 ASoC: Fix bad clock errors checking
Applying: sound: Fix after includes renaming in 3.3
Applying: sound: Fix for audio doesn't work in IK 3.3
Applying: ASoC: Ux500: Fix merge error causing DMA leak
Applying: ASoC:Ux500: Random crash in MSP driver
Applying: ASoC: Ux500: Correct AV8100 InfoFrame-settings
Applying: ASoC: codecs: ab5500: Fix build warning
Applying: ASoC: Ux500: Adds d2d support for linein to headset & speaker
Applying: ASoC: Ux500: Sidetone sequence control and error handling
Applying: ASoC: Ux500: Move dma handling to platform driver
Applying: USB:Enabling autosuspend in Host audio
Applying: ASoC: Ux500: Disable HS Zero Cross control
Applying: ASoC: ux500: Request default QOS instead
Applying: ASoC: Ux500: Correct Bit-clock Frequency
Applying: audio: u8500: Vibrator: Timed output vibrator driver

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-caif onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-caif

First, rewinding head to replay your work on top of it...
Applying: CAIF: Minor alignment with internal CAIF git
Applying: caif-shm: synchronize caif flow control
Applying: caif-shmcore: increase the priority of flow control wq
Applying: caif-shmcore: in tx check for buffer full condition

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-cg2900 onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-cg2900

First, rewinding head to replay your work on top of it...
Applying: staging: Add ST-Ericsson CG2900 driver
Applying: cg2900: Add regulator support
Applying: cg2900: Fix chip enable
Applying: staging: cg2900: Update for api change in 3.0
Applying: staging: cg2900: Fix for gpio header move
Applying: cg2900: Fix crash when transport is closed
Applying: cg2900: Disable chip when init failed
Applying: mfd/cg2900: Fix for memory leak when using logger.
Applying: cg2900: Use correct struct for SCO start stream
Applying: cg2900: Do not send RX data to wrong user
Applying: cg2900: Add pdata_size to mfd_cell
Applying: cg2900: Delay creation of MFD devices
Applying: Adding a delay to CG2900 enable to make the chip start up correctly
Applying: cg2900: bluetooth support for 5500
Applying: cg2900: Fix for not working BT on hrefp V71
Applying: cg2900: Fix checkpatch issues
Applying: cg2900: Set WLAN_PMU_EN for startup
Applying: u9500: GPIO conflicts with external modem
Applying: Revert "cg2900: bluetooth support for 5500"
Applying: cg2900: bluetooth support for 5500
Applying: cg2900: Set WLAN_PMU_EN for startup
Applying: u9500: cg2900: GPIO conflicts with external modem
Applying: cg2900: Add KernelDoc
Applying: ux500: use updated gpio driver
Applying: cg2900: prcmu: fix path to header file
Applying: cg2900: u5500: Make ux500 play nice at build time
Applying: cg2900: Fix merge problems
Applying: cg2900: Use correct platform_data
Applying: cg2900: Register CG2900 as clock source for wlan
Applying: cg2900: Fix after 3.1 rebase
Applying: mfd/cg2900: Support HCI Raw Channel.
Applying: mfd/cg2900: Error opening HCI Raw Channel
Applying: cg2900: Use PM QoS for CG2900 UART
Applying: cg2900: Use Dynamic Machine configuration.
Applying: cg2900: Fix Memory Leak during Driver Init.
Applying: cg2900: Add support for 3.25 Mbps
Applying: staging: Add ST-Ericsson CG2900 driver compilation
Applying: cg2900: updates for 3.2
Applying: cg2900: Fix for race condition
Applying: cg2900: [U9500] Correct the GPIO configuration for WLAN
Applying: cg2900: Changes for porting on 3.3
Applying: cg2900: Code optimizations for CG2900 init time
Applying: CG2900: Fix timings for CG29XX during break
Applying: CG2900: changing sleep timers
Applying: cg2900: Support new connectivity chips
Applying: cg2900: Wrong sequence number from CG2910/05
Applying: cg2900: firmware download at 115kbps CG2910/05
Applying: cg2900: Add support for 9540
Applying: cg2900: Fix FM audio issues on cg2905/10
Applying: cg2900: ux500: Add U8520 machine
Applying: cg2900: Change the PMU_EN gpio for snowball

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-cg2900-fm onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-cg2900-fm

First, rewinding head to replay your work on top of it...
Applying: CG2900 FM radio: Add support for Tone Gen and De-emphasis.
Applying: CG2900 FM Radio: RDS decoding time is too long.
Applying: CG2900 FM Radio: Handling Mono-Stereo Interrupt.
Applying: CG2900 FM Radio: CG2900 stops responding in FM Tx.
Applying: CG2900 FM Radio: BandScan IOCTL Calls Hangs.
Applying: CG2900 FM Radio: Adapt to kernel 3.0
Applying: CG2900 FM Radio: Block Scan not working for non EU bands.
Applying: CG2900 FM Radio: RDS data cannot be retrieved.
Applying: CG2900 FM Radio: Improper RDS Thread handling.
Applying: CG2900 FM Radio: Fix improper handling of response buffer
Applying: FM Radio: Update FM driver for CG2910/05
Applying: FM Radio: Remove analog volume control - CG2910/05
Applying: cg2900: fm_driver: Fix warning
Applying: CG2900 FM Radio: Implement FMR_RP_Stereo_SetControl_BlendingRSSI
Applying: G2900 FM Radio: Disable RDS Group rejection

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-core onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-core

First, rewinding head to replay your work on top of it...
Applying: ARM: kernel: smp_twd: Add save/restore functions
Applying: add prototype for cpu_idle_wait in system.h
Applying: fix build errors with CPU_IDLE enabled
Applying: ARM: smp: don't recalculate loops_per_jiffy
Applying: misc/bh1780gli: add PM features
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/misc/bh1780gli.c
Applying: mpcore_wdt: Set correct watchdog rate
Applying: amba-pl022: Initialize burstsize from FIFO trigger level
Applying: arm: allow passing an ELF64 header to elf_check_arch() Signed-off-by: Per Fransson <per.xx.fransson at stericsson.com>
Applying: mpcore_wdt: Stop watchdog of non-crashing cores
Applying: mfd: stmpe: Recheck the status to avoid failure stmpe: add stmpe documentation to DocBook
Applying: i2c: nomadic-i2c driver updates for clock and power, busy management
Applying: nmk-i2c: use pm_runtime API
Applying: i2c-nomadik: Add code to retry on timeout failure and set i2c clock to 400KHz
Applying: nmk-i2c: use pm_runtime API
Applying: i2c-nomadik: Add code to retry on timeout failure and set i2c clock to 400KHz
Applying: backlight/leds: add low threshold to pwm backlight/led
Applying: abx500: big merge from GLK 2.6.35
Applying: hwmon db8500: update for new prcmu interface
Applying: ux500-ARM : make backup RAM as an executable area
Applying: ARM : handle preempt count in cpu_idle
Applying: u8500: enable u8500 configurations
Applying: Add clean and flush_dcache_all to ARM cache API
Applying: ARM: Translate delay.S into (mostly) C
Applying: ARM: Allow machines to override __delay()
Applying: ARM: Implement a timer based __delay() loop
Applying: ARM: kernel: Remove warnings
Applying: Adding configuration options for cg2900.
Applying: amba-pl022: Add loopback support for the SPI on 5500
Applying: mfd: add a core driver for TI TPS61050/TPS61052 chips v2
Applying: BH1780: Fix regulator name
Applying: ux500: Align u8500 defconfig with 2.6.35 one, u5500 is enabled too
Applying: power: ab8500-bm: update usb state change interface to otg notifier
Applying: Update USB configurations in u8500_defconfig
Applying: wdt: Warnings fix
Applying: ux500: Adding board, smsc911x and DHCP configuration for snowball
Applying: mach-ux500: cleanup u8500_defconfig
Applying: ux500:Removing warnings from USB
Applying: power: ab8500_bm: Use maximum charger current according to charger configuration
Applying: power: ab8500_bm: Allow USB charger voltage to collapse
Applying: i2c-nomadik: Remove the unnecessary delay
Applying: mfd: ab8500_gpadc: Corrected the name and bitmask for BTempPullUp
Applying: DB Thermal Driver: Add label,min/max_alarm
Applying: drivers: video: add regulator for CVBS out
Applying: power: ab8500_fg: Adding internal fuel gauge offset calibration
Applying: Export SoC info through sysfs
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/base/Kconfig
CONFLICT (content): Merge conflict in drivers/base/Kconfig
Auto-merging drivers/base/Makefile
Auto-merging drivers/base/soc.c
CONFLICT (add/add): Merge conflict in drivers/base/soc.c
Auto-merging include/linux/sys_soc.h
CONFLICT (add/add): Merge conflict in include/linux/sys_soc.h
Failed to merge in the changes.
Patch failed at 0045 Export SoC info through sysfs

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-core has 3 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	drivers/base/Kconfig
	drivers/base/soc.c
	include/linux/sys_soc.h
#### Counting how many more conflicts there would have been
.. - tracking-igloo_kernel-core will fail 2 more times ####


Failed to auto-resolve
HEAD is now at 7226d34 serial:pl011:Patch for resume and hibernation issue
Deleted branch rebasing-igloo_kernel-core (was 7226d34).

============================================================================================
Rebasing tracking-igloo_kernel-dma onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-dma

First, rewinding head to replay your work on top of it...
Applying: dma40: Resetting priority bit for logical channels
Applying: dmaengine/ste_dma40: use writel_relaxed for lcxa
Applying: dmaengine/ste_dma40: set dma max seg to 0xffff
Applying: dmaengine/ste_dma40: limit burst size to 16
Applying: dma40: Add the needed functions for STE audio support
Applying: dma40: don't check for pm_runtime_suspended()

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-gpio onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-gpio

First, rewinding head to replay your work on top of it...
Applying: add html doc for ux500 gpio
Applying: mach-ux500: gpio: Moved the NOMADIK_NR_GPIO
Applying: ux500: gpio: move gpio base numbers to platform header
Applying: gpio/nomadik: move the Nomadik GPIO header
Applying: gpio: ux500: Activate and port ab8500 GPIO driver onto 3.x
Applying: nmk-gpio: cache [rf]w?imsc
Applying: nmk-gpio: fix spurious interrupts with SKE
Applying: gpio: ab8500: make pins configurable
Applying: gpio: ab8500: fix alternate function register address
Applying: gpio: ab8500: read register corrected in get_value api
Applying: gpio: ab8500: allow direction and pullups configuration
Applying: gpio: ab8500: add api to enable pulldown
Applying: gpio: ab8500: write argument value instead of hardwired 1
Applying: gpio: ab8500: use gpio base number defined for the platform
Applying: gpio: ab8500: fix gpio offset bounds for irq mapping
Applying: gpio: nomadik: support low EMI mode
Applying: gpio: nomadik: Use __io and IO_ADDRESS
Applying: gpio: ab8500: Fix bad include name after renaming
Applying: gpio/gpio-stmpe: Add support for no-interrupt cfg
Applying: gpio/gpio-stmpe: Correct cleanup for no-irq mode
Applying: gpio/stmpe: Change implementation of noirq mode
Applying: mfd/ab8500: gpio: support AB9540 variant
Applying: mfd/ab8500: gpio: remaining mainline differences
Applying: drivers: gpio ab9540
Applying: gpio: mach-ux500: support ape u9450
Applying: gpio-ab8500:Add support for AB8505 Chip
Applying: ab8500-gpio: allow gpios waking system from suspend

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-hsi onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-hsi

First, rewinding head to replay your work on top of it...
Applying: HSI: hsi: Introducing HSI framework
Applying: HSI: omap_ssi: Introducing OMAP SSI driver
Applying: HSI: omap_ssi: Add OMAP SSI to the kernel configuration
Applying: HSI: hsi_char: Add HSI char device driver
Applying: HSI: hsi_char: Add HSI char device kernel configuration
Applying: drivers: hsi: Add hsi_char device to /dev/ folder
Applying: arch: arm: ST-E HSI controller
Applying: drivers: hsi: Add ST-E HSI controller
Applying: drivers: hsi: Add CAIF-HSI glue layer
Applying: drivers: hsi: context save/restore for STE HSI
Applying: ARM: U8500: ST-E HSI: DMA burst and PIPE support
Applying: ARM: U8500: ST-E HSI: RX FRAMEBURSTCNT set to 0xFF
Applying: ARM: U9500: HSI core clocks initialization
Applying: ARM: U9500: HSI RX PIPELINE buffer flush
Applying: ARM: U9500: HSI registers update to DB8500 V2 spec
Applying: drivers: U9500: Add WAKE support in ST-E HSI
Applying: u95xx: Add API for HSI channel priority
Applying: drivers: u95xx: Add HSI channel priority

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-hwmem onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-hwmem

First, rewinding head to replay your work on top of it...
Applying: hwmem: Add hardware memory driver to kernel
Applying: mach-ux500: add dcache necessary for hwmem
Applying: HWMEM: Update API
Applying: HWMEM: Make user space include linux/types.h
Applying: HWMEM: Reset ref count in clean_alloc
Applying: HWMEM: Alloc kernel vaddrs on boot
Applying: HWMEM: Break out allocator
Applying: Lee's chunk to make the kernel compile
Applying: hwmem: Add peak memory usage in debugfs prints
Applying: misc: Compile hwmem misc driver
Applying: ux500: hwmem: Add protected hwmem support
Applying: hwmem: Fix kernel headers check problem

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-input onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-input

First, rewinding head to replay your work on top of it...
Applying: input: update bu21013 touchscreen controller staging: update Synaptics RMI4 touchpad driver
Applying: u5500: add DB5500 keypad driver
Applying: keyboard: add tc35893 driver
Applying: input: abx500: big merge from GLK 2.6.35
Applying: input: Dynamic enable or disable of SKE keypad events
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/input/keyboard/nomadik-ske-keypad.c
Applying: input: Dynamic enable or disable of STMPE1601 keypad events
Applying: input/keypad-stmpe: add suspend/resume support
Applying: input: Multi key press support is added for SKE keypad
Applying: input:ske: Suspend and resume support for ske keypad
Applying: input:ske: Remove multiple interrupts for each keypress
Applying: input:ske:Decrease the CPU load during continue key press
Applying: input:ske:Add the regulator support in ske driver
Applying: input:ske: Fix rename CONFIG_KEYBOARD_NOMADIK to CONFIG_KEYBOARD_NOMADIK_SKE
Applying: input: Fix warnings
Applying: DocBook: Update tc_keypad doc for new files
Applying: u5500: Fix compilation errors after rmi4 ts driver moved in staging area
Applying: Input: Add AB8500 AV Acc. Detection as platform drv
Applying: input: accdet: Workaround for AB8500 gpio (now use AB8500 offset)
Applying: drivers: input: enable accessory detect on default
Applying: input: misc: ab8500-accdet: Power optimisation fix.
Applying: bu21013: Proper reset implementation during suspend and resume
Applying: ske keypad: Proper regulator and clock framework support
Applying: input: ab8500-ponkey: make generic
Applying: db5500-keypad: remove clk hacks
Applying: db5500-keypad: handle suspend/resume
Applying: input/mfd: AB5500 ONSWa support
Applying: input: ab8500-accdetect suspend modification
Applying: input:ab8500-accdet: Add accessory detect for hrefv60
Applying: ab8500-accdet: Handle interrupts on comparator disable/enable
Applying: input; ab8500 accdet: Fix sparse warnings
Applying: db5500-keypad: fix ROW_SHIFT
Applying: u5500:Docbook:Added the tmpl files for drivers
Applying: input: ske: Fix for gpio header move
Applying: gpio: nomadik: Rename AB8500_GPIO by GPIO_AB8500
Applying: input: fix STMPE keypad input device name by removing spaces
Applying: u5500: ponkey: shutdown time configuration
Applying: ab8500-accdet: Disable vamic1 in suspend
Applying: db5500_keypad: check return values from all calls
Applying: vibrator: Force feedback vibrator driver
Applying: db5500_keypad: handle regulator in apsleep
Applying: db5500_keypad: don't configure all keypad pins
Applying: db5500_keypad: check return value of request_gpio
Applying: ab5500: move to separate header
Applying: touchscreen: Add Cypress driver
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/input/touchscreen/Kconfig
Auto-merging drivers/input/touchscreen/Makefile
CONFLICT (content): Merge conflict in drivers/input/touchscreen/Makefile
Auto-merging drivers/input/touchscreen/cyttsp_core.c
CONFLICT (add/add): Merge conflict in drivers/input/touchscreen/cyttsp_core.c
Auto-merging drivers/input/touchscreen/cyttsp_core.h
CONFLICT (add/add): Merge conflict in drivers/input/touchscreen/cyttsp_core.h
Auto-merging drivers/input/touchscreen/cyttsp_spi.c
CONFLICT (add/add): Merge conflict in drivers/input/touchscreen/cyttsp_spi.c
Failed to merge in the changes.
Patch failed at 0044 touchscreen: Add Cypress driver

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-input has 4 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	drivers/input/touchscreen/Makefile
	drivers/input/touchscreen/cyttsp_core.c
	drivers/input/touchscreen/cyttsp_core.h
	drivers/input/touchscreen/cyttsp_spi.c
#### Counting how many more conflicts there would have been
....... - tracking-igloo_kernel-input will fail 7 more times ####


Failed to auto-resolve
HEAD is now at 5393198 ARM: ux500: input: abx500-accdet: Move header file
Deleted branch rebasing-igloo_kernel-input (was 5393198).

============================================================================================
Rebasing tracking-igloo_kernel-mach-plat onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-mach-plat

First, rewinding head to replay your work on top of it...
Applying: i2c-nomadik: Change the TX and RX Threshold
Applying: mach-ux500: platform data for HED54XXU11 Hall effect sensor
Applying: mach-ux500: add platform data for PWM leds driver
Applying: mach-ux500: all the necessary for abx500 platform data
Applying: mach-ux500: add pins.c to align with old kernel
Applying: mach-ux500: Set size of DMA consistent pool to 16M on u8500
Applying: mach-ux500: BU21013: Fix compilation in platform data
Applying: mach-ux500: Add definitions for MSP i2s
Applying: mach-ux500: merge 2.6.35 pins definitions
Applying: mach-ux500: add msp support in board files
Applying: mach-ux500: add dma & hcl_defs files
Applying: mach-ux500: add hwmem platform data
Applying: mach-ux500: Add platform data for LSM303DLH accelerometer + magnetometer & L3G4200D Gyroscope sensors
Applying: mach-ux500: Add Trace Modem platform device
Applying: mach-ux500: boards merge from GLK 2.6.35
Applying: Fixing IRQ header dependency for snowball
Applying: mach-ux500: put all ste-dma40-db*.h in include/mach & withdraw duplicated files
Applying: mach-ux500: Align u5500 boards with 2.6.35
Applying: mach-ux500: Add multi key layout support for ST-UIB
Applying: mach-ux500: full alignment with 2.6.35
Applying: mach-ux500: timer: activate ARCH_HAS_READ_CURRENT_TIMER
Applying: mach-ux500: uart: add platform uart hearder
Applying: u8500: Add missing DMA channels config
Applying: ux500: Disable DMA channels for uart drivers.
Applying: ux500: routing power to and enabling cg2900
Applying: ux500: Export U8500 SoC info through sysfs
Applying: ARM: ux500: clock: Disable periph7 and sync APEATCLK and APETRACECLK
Applying: mach-ux500: video: mcde: Request dsi/dpi clocks only if needed
Applying: ux500: Remove internal pullup on all i2c lines
Applying: mach-ux500: ab5500: fixes and basic irq support
Applying: ux500: sw reset: Save SW Reset Reason before reset
Applying: ARM: ux500: Configure SysClkReq3 and 5 as GPIO
Applying: board-mop500-pins: Configure Flash GPIOs pins
Applying: mac-ux500: regulator Added regulator for sysclkreq and connected BT and WLAN
Applying: mach-ux500: Reset SD card detect pin to pull-up
Applying: mach-ux500: Fix for MMC working on u5500 and DMA support.
Applying: u5500: add basic clock support
Applying: mach-ux500: regulators: Set SysClkReq6 pin in GPIO mode
Applying: mach-ux500: pm: Force GPIO power settings in suspend
Applying: mach-ux500: Control WLAN pins correctly
Applying: mach-ux500: Control bluetooth pins correctly
Applying: board-mop500: Add cmdline param for GPIO config
Applying: ske keypad: Proper regulator and clock framework support
Applying: ux500: mcde: Add regulator ids for U5500
Applying: mach-ux500: video: av8100: Add Alternative Powerup Sequence
Applying: u5500: board: add regulators
Applying: mach-ux500: Use pm_runtime for sdi[x] for GPIOs + board-mop500-pins.c alignment
Applying: mach-ux500: Exclude SDIO DAT1 from GPIO force pins
Applying: mach-ux500: HWMEM: Break out allocator
Applying: video: av8100: Add HDMI support for U5500
Applying: board-u5500: Add i2c timeout initialization
Applying: mach-ux500: ab5500: provide a driver for power off
Applying: mach-ux500: input:ab8500-accdet: Add accessory detect for hrefv60
Applying: ux500: pm: access the "force pins in suspend" functions indrectly
Applying: board-u5500.c : Add platform data for LSM303DLH sensor
Applying: mach-ux500:sdi3: Added platform data for SDIO support
Applying: u5500: move pins to separate file
Applying: u5500: move i2c to dynamic muxing
Applying: arm: ux500: Configure modem STM pins correctly in sleep
Applying: ab5500: leds: driver for ab5500 leds
Applying: u5500: add the Vape power state regulator
Applying: wlan: cw1200: Correction for initial state of WLAN_ENA pin.
Applying: mach-ux500: cw1200: Integration with mach-ux500
Applying: mach-ux500: gpio: Moved the NOMADIK_NR_GPIO
Applying: mach-ux500: reg: Add snowball wlan regulator
Applying: ux500: Change makefile to support ux500 soc
Applying: ux500: add gyro data and device in stuib (for snowball)
Applying: ux500: Add start up time to wlan regulator
Applying: ux500: Add power off to platform data
Applying: ux500: add barometer data and device in stuid (for snowball)
Applying: mach-ux500: include a vital define for GPIO ranges
Applying: ux500: add pl310 prefetch control
Applying: board-u5500: correct axis alignment for lsm303dlh
Applying: mach-ux500: Expose PRCMU TCDM reset reason in /sys
Applying: mach-ux500: Interpret reset reasons
Applying: mach_ux500: Add support for mloader.
Applying: u5500: leds: generic/compatible name for rgb leds
Applying: mach-ux500: video: mcde: improve display configuration
Applying: ARM: ux500: Update suspend GPIO force comments
Applying: mach-ux500: common dbx500 prcmu driver api
Applying: ab8500-gpio: Allow initial configuration of GPIO registers
Applying: u5500: add ePOD consumers
Applying: mach-ux500: GPIO power settings in suspend
Applying: board-u5500: Increase the RX FIFO threshold
Applying: ux500: pm_runtime: add DMA to ux500 power domain
Applying: U5500 : Initial SIM level shifter configuration
Applying: mach-ux500: Add mmio device files and device
Applying: mach-ux500: Adding Support for U5500 Camera Board
Applying: ux500: irq: Fix multi boards support & put board common parts to mach/irqs.h
Applying: mach-ux500: Fix build problems temporary
Applying: mach-ux500: Fix for gpio header move
Applying: mach-ux500: Fix board merge & cleanup
Applying: mach-ux500: prcmu regulators: use upstream db8500 prcmu regulator driver instead
Applying: ux500: fix PRCMU boot problem, use new MFD driver & code cleanup
Applying: mach-ux500: Fix PRCMU support on U5500 platforms for 3.0
Applying: mach-ux500: move U5500 PRCMU regulator driver into regulator drivers and cleanup for 3.0
Applying: ux500: align u5500 PRCMU & CPUFREQ management with u8500 (multiple commits in one)
Applying: u5500: add PMU device
Applying: board-u5500: Add SPI3 platform data
Applying: u5500: board: leds: lm3530: calibrate ALS input voltage
Applying: drivers: modem: Add modem access driver for STE U8500
Applying: mach-ux500: Suppress ../../ for external include
Applying: mach-ux500: Support db8500 v2.2 chip in kernel
Applying: u5500: support GPIO interrupts via PRCMU
Applying: U8500 : driver for awaking modem on sim hot swap activity
Applying: mach-ux500: platform data for ab5500 battery driver
Applying: ARM: u8500: dma: Remove V1 support
Applying: ARM: ux500: Add platform data for prcmu watchdog
Applying: mach-ux500: Add GPIO pin config for modem uart
Applying: ARM: ux500: Remove u8500 ED and V1 support
Applying: u5500: ensure AB<->PRCMU pins don't change with IOFORCE
Applying: U8500: change GPIO for SIM activity detection driver
Applying: mach-ux500: Align ux500 platform files with previous 2.6.35 ones
Applying: Correcting machine name for proper parsing in Android's init.
Applying: board: snowball: set right GPIOs for Accelerometer/Magnetometer LSM303DLH driver
Applying: Snowball: Change initial GPIO26 direction
Applying: ux500_ing05160_sim_detect_0.1:change GPIO for SIM activity detection driver
Applying: ux500: provide GPIO_TO_IRQ
Applying: lsm303dlh: Detect chip version at run time
Applying: u5500 : ab5500 core driver update for cut 2.0
Applying: u5500: ponkey: shutdown time configuration
Applying: u5500: add cpu_is_u5500v2()
Applying: mach-ux500: ste support for Osram SFH7741 and Samsung HED54XXU11
Applying: sensors1p.c: Correct invalid assignment
Applying: ARM: ux500: sensors1p: Fix section mismatch
Applying: ux500: dma: update
Applying: ux500: regulators: update
Applying: ux500: gpio: update
Applying: u5500: regulators: remove LDO S (VANA) control
Applying: mach-ux500: Platform data for ske
Applying: mach-ux500: negate the values of sensors in 5500
Applying: mcde: mach-ux500: Migrate the patches for kernel3.0
Applying: mcde: mach-ux500: Migrate to kernel 3.0
Applying: hwmon: dbx500: Migrate to kernel3.0
Applying: vibrator: Force feedback vibrator driver
Applying: mcde: u5500: Migrate to kernel3.0
Applying: mach-ux500:u5500:GPIO pins list migrate to kernel30
Applying: db5500_keypad: handle regulator in apsleep
Applying: db5500_keypad: don't configure all keypad pins
Applying: ARM: u8500: Add charging as reset reason
Applying: pl011: migrate pl011 changes from 2.3v3.2
Applying: board-u5500: correct pin behavior for db5500_keypad
Applying: u5500: remove duplicate pmu, add RTC/BOOTROM iomap
Applying: u5500: fix PRCMU
Applying: mach-ux500:u5500:DMA platform data for kernel 3.0
Applying: mach-ux500: cg2900: Set WLAN_PMU_EN for startup
Applying: u9500: GPIO conflicts with external modem
Applying: mach-ux500:Platform data for kernel 3.0
Applying: mach-ux500: cryp/hash: Updated for both u8500 & u5500
Applying: mach-ux500: u5500: SD/MMC migrate to kernel3.0
Applying: board-mop500: change the ssp0 bus id
Applying: mach-ux500: touchscreen: Add Cypress driver
Applying: mach-ux500: Thermal power off
Applying: mach-ux500: pm: runtime: upgrade to 3.0
Applying: mach-ux500: dynamic detection of uibs
Applying: ux500: optimize out cpu_is_* if not compiled in
Applying: mach-ux500: change keymap of TC35892x
Applying: board-mop500: Correct the video_ctrl_gpio initialization
Applying: ux500: changed the end variable in modem trace.
Applying: u9500: GPIO conflicts with external modem
Applying: mach-ux500: WLAN: u5500: Add wlan init to u5500 board file
Applying: mach-ux500: WLAN: u5500: Add new wlan platform file for u5500
Applying: ARM: u8500: Update reboot reasons
Applying: mach-ux500: Functions to check for S5500 Board
Applying: ux500: sw reset: Changes in reset reasons
Applying: mach-ux500: dma40: Add support to use lcla area from esram
Applying: mach-ux500: Enable Camera PMIC for S5500V2 Board
Applying: mach-ux500:input:misc: Add accessory driver
Applying: arm: ux500: Configure dsi clocks and regulators
Applying: mach-ux500: Add db8520 cpu type
Applying: ARM: u8500: Not every u8500 has a TPS6105
Applying: ARM: mach-ux500: Remove powersave
Applying: ARM: plat-nomadik:timer: Add delay timer support
Applying: ARM: ux500: Enable timed delay
Applying: ARM: mach-ux500: Replace mach prcmu driver with mainlined version
Applying: ARM: mach-ux500: pm: Added context and pm
Applying: ARM: ux500: Restore MTU on resume
Applying: ARM: mach-ux500: suspend: Force gpio pins
Applying: drivers: timer: cpuidle U8500 support
Applying: mach-ux500: watchdog: Reset to mainline status
Applying: ARM: ux500: Use u8500_wdt
Applying: mach-ux500: regulator: restore ab8500 and db8500 regulators to linux-next state
Applying: mach-ux500: mcde: update supply names
Applying: mach-ux500: use updated gpio driver
Applying: ux500: gpio: move gpio base numbers to platform header
Applying: u5500: prcmu: fix path to header file
Applying: plat-nomadik: gpio: nomadik: support low EMI mode
Applying: mach-ux500: Change device names for ux500
Applying: mach-ux500: reg: Add snowball wlan regulator
Applying: ux500: Add start up time to wlan regulator
Applying: mach-ux500: Add en_3v3 regulator to snowball
Applying: mach-ux500: input: add db5500 keypad support
Applying: mach-ux500: bu21013: Proper reset implementation during suspend and resume
Applying: mach-ux500: arm: add ST-E HSI controller
Applying: mach-ux500: gpio/nomadik: move the Nomadik GPIO header
Applying: mach-ux500: crypto: Add crypto and hash acceleration
Applying: mach-ux500: video: machine video part adding
Applying: mach-ux500: MIPI System Trace Module platform dependent driver part
Applying: mach-ux500: pm: Update Makefile & Kconfig for power management
Applying: mach-ux500: gpio: Select Nomadik gpio for ux500 platform
Applying: mach-ux500: hwmem: compile ux500 hwmem platform specific code
Applying: mach-ux500: Compile u8500 board specific battery management code
Applying: mach-ux500: Withdraw mbox-db5500 & Compile modem platform specific code
Applying: mach-ux500: security: Fix TEE part in Kconfig
Applying: mach-ux500: Compile hardware register access driver
Applying: mach-ux500: Merge fix around pm (timer and regulator)
Applying: mach-ux500: pwr_domain renamed to pm_domain in 3.1
Applying: ux500: uib: Dont start driver for snowball
Applying: ux500: Separate sensors and stuib
Applying: ux500: Remove i2c devices not avalible in snowball
Applying: ux500: Add sensors for snowball
Applying: ux500: Start crash dump through SW reset
Applying: u5500: leds: add ab5500v2 HVLED blink feature
Applying: Enable pull down for GPIO/MSP2
Applying: u5500:Enable low EMI for SDI3(GPIO171-175)
Applying: mach-ux500: add the proper device name of bu touchscreen
Applying: mach-ux500: u8500: STM: board depended code split
Applying: ux500: uib: Add functions to get type of uib
Applying: ARM: ux500: pins: Add debugfs info entry
Applying: ux500: camera_flash: add platform data for adp1653
Applying: ab8500: Separate regulator and MFD platform data
Applying: regulators: ab8500: Add support of low voltage battery
Applying: ux500: Changed fallback reboot reason
Applying: u9500: fix HSI configuration to match with M7400
Applying: u5500: set SLPM for ACCUART pins
Applying: ARM: plat-nomadik: Add alias to clarify settings
Applying: ARM: ux500: Add missing include
Applying: mach-ux500: board-mop500-stuib: use gpio_set_value_cansleep to avoid gpio lib warnings
Applying: mach-ux500: touchscreen: Add Cypress driver for U8500UIB_R3
Applying: mach-ux500: input: dynamic detection of uibs
Applying: ARM: ux500: input: Replace mach prcmu driver with mainlined version
Applying: mach-ux500: keypad support for sony display
Applying: mach-ux500: Makefile: Modifications for topic branches isolation
Applying: mach-ux500: sd/mmc: make board-mop500-sdi.c compile with latest changes in mach-ux500
Applying: mach-ux500: Changes in UIB boards for topic branches isolation
Applying: mach-ux500: devices: Changes for topic branches isolation
Applying: mach-ux500: dma: Put HSI changes under CONFIG_HSI flag
Applying: mach-ux500: Update boards for topic branches isolation
Applying: mach-ux500: Withdraw Video & modem specifics Config
Applying: ux500: Detect accelerometer i2c address on snowball
Applying: mach-ux500: Add module.h include after 3.2 update
Applying: mach-ux500: board-mop500-pins.c update for 3.2 kernel
Applying: mach-ux500: Include export.h after 3.2 update
Applying: mach-ux500: board: Fix initializations for HREF & Snowball boards
Applying: mach-ux500: pins: Initialize u8500_pins before over pins
Applying: ux500: Change to the u8500 wdt
Applying: ux500: recouple gic on boot
Applying: mach-ux500: Configure SysClkReqRfClkBuf
Applying: ux500: mcde: Remove mcde hardware specifics
Applying: u5500: add correct GPIO devices
Applying: ux500 pins: Configure HSI GPIO pins only for U9500
Applying: ux500 pins: Set sleep-mode HSI GPIO configuration
Applying: ARM: ux500: pins-debug: Fix leak
Applying: ARM: ux500: pins-debug: Only show relevant information
Applying: ARM: ux500: sensors: Update with gpio handling
Applying: ARM: ux500: Remove outdated sensors1p driver
Applying: dma40: Enable lcla in esram in u8500
Applying: ux500: pins: mcde: Remove DPI display device
Applying: mach-ux500: mcde: Remove static board configuration
Applying: mach-ux500: Save dbx500 registers on crash
Applying: ux500: Stub function to make board-ux500-cg2900.c compile within a U5500 configuration
Applying: [U9500] Correct the U9500 identification
Applying: mach-ux500: Make fb create code generic
Applying: mach-ux500: u5500: add MTIMER clocksource
Applying: ARM: ux500: gpio-keys: Remove dynamic handling of pins
Applying: ux500: use choice for sched_clock
Applying: ARM: ux500: i2c: Add sleep states to runtime pin management
Applying: mach-ux500: expose system info through socinfo
Applying: ux500: gpio: allow offchip gpios to be initialized
Applying: u8500: ab8500: workaround for 3.2MHz oscillator auto shutdown
Applying: mach-ux500: CONFIG_LEDS_PWM build error
Applying: mach-ux500: crypto: hash: DMA support
Applying: mach-ux500:Enable LOWEMI for SPI3 pins
Applying: mach-ux500: update gpio pins for SIM Reset
Applying: ARM: ux500: Coding style fixes
Applying: ARM: ux500: Remove unused header file
Applying: u5500: support crash indicator LED
Applying: ARM: u8500: board-mop500-pins: Naming and minor code clean-up
Applying: mach-ux500: Add a reset reson for exit for charge only mode
Applying: ARM: ux500: board-mop500: whitespace clean-up
Applying: u5500: wait longer for reboot
Applying: mach-ux500: Brightness changing time of LCD backlight
Applying: mach-ux500: leds: Pull the HWEN gpio low when brightness is 0
Applying: mach-ux500: regulator: ab8500-ext: Add VextSupply1 regulator
Applying: u5500: cleanup is_s5500_board()
Applying: u5500: detect pre-R3A boards
Applying: U9500: Add function cpu_is_u9500()
Applying: u5500: pl011: Workaround for UART registers lockup
Applying: mach-ux500: u5500: support regulator changes on S5500 R3A
Applying: ARM: ux500: gpio-keys: Don't claim gpios at boot
Applying: ARM: ux500: gpio-keys: Add power domain
Applying: u5500: pins: configure USB pins
Applying: u5500: pins: fix SPI
Applying: u5500: pins: configure initial states for SD level shifter
Applying: u5500: pins: explictly mention i2c configuration
Applying: mach-ux500: U9500: Add wake-up support for ST-E HSI
Applying: u5500: pins: configure Dual SIM controller pins
Applying: u5500: pins: configure SERVICEn
Applying: mach-ux500: u5500 : modem crashdump detection driver
Applying: mach-ux500: u5500-mbox: APE - Modem power management protocol
Applying: u5500: pins: configure TVOUT pins
Applying: u5500: pins: fix KEYIN0
Applying: u5500: pins: configure initial state of HDMI INT and ENABLE
Applying: u5500: pins: configure unused display pin
Applying: mach-ux500:Add platform data of sensors for R3UIB
Applying: mach-ux500:Configure Proximity GPIO based on UIB
Applying: mach-ux500: Invert X,Y co-ordinates of sensors
Applying: mach-ux500: i2s: Remove obsolete header file
Applying: board-u5500-pins: Set LOWEMI on I2C3 pins
Applying: UIBR3: do not handle GPIO 146 in sleep mode
Applying: mach-ux500: board-mop500-uib: Fix coverity defect
Applying: mach-ux500: Read the chip_id of LSM303
Applying: u5500: dma: add into power domain
Applying: u5500: Save prcmu registers on crash
Applying: board-u5500-pins: Enable LOWEMI I2C pins
Applying: u5500: remove duplicate version print
Applying: u5500: pins: fix SD feedback clock gpio pin
Applying: u5500:Fix the SD card detection pin
Applying: ARM: ux500: hardware.h: Remove io_p2v
Applying: mach-ux500: ASoC: Move i2s into ASoC and remove old i2s-layer
Applying: u5500: lowemi mode for uart3 tx and cts pins
Applying: mach-ux500: watchdog: Driver rename
Applying: mach-ux500: watchdog: Add 5500 support
Applying: Arm: u95xx: Add default HSI channel priority
Applying: u5500:pins: Adding support for startup graphics
Applying: mach-ux500: u5500: deprecate v1 hardware
Applying: mach-ux500: U8500 UIBs: Move sensors management to board-mop500-sensors.c
Applying: mach-ux500: msp: CONFIG_STM_MSP_I2S to CONFIG_STM_MSP_SPI renaming
Applying: arm: Set ARCH_NR_GPIO to 355 on U8500 platform
Applying: mach-ux500: Fix io mapping overlap and reduce DMA consistent pool to 14M
Applying: ux500: Remove keyboard pin definition for snowball
Applying: ux5000: cpu: Fix bad PRCMU include order
Applying: U5500: Set unused AB5500 pins as GPIO
Applying: mach-ux500: Save db8500 fuses on crash
Applying: mach-ux500: Export dbx500_id symbol
Applying: skekeypad:Release all acquired resources
Applying: mach-ux500: Save dbx500 registers on panic
Applying: mach-ux500: Change dump size of prcmu_icn_pmu
Applying: ux500: touch: Align touch with display
Applying: pl011: add soft reset routine for each uart instance
Applying: mach-ux500: musb: Add pm runtime support
Applying: mach-ux500: Add platform data for ADP1653 in R3UIB
Applying: u8500: Don't probe modem related drivers for AP9500
Applying: mach-ux500: video: mcde: add rotbufsize
Applying: mach-ux500:board-u5500: Add missing return value
Applying: mfd/ab8500: irqs: support AB9540 variant
Applying: mach-ux500: Add support for 9540
Applying: mach-ux500: support ape u9450
Applying: mach-ux500:  9540 prcmu specific io
Applying: mach-ux500 : 9540 prcmu dump, context
Applying: ux500: Add U8520 machine
Applying: ux500: mfd: ab8500: Configure AB8505
Applying: mach-ux500: Update U8520 SD-card GPIO pins
Applying: ARM: ux500: cyttsp: Fix file permission
Applying: ARM: ux500: Wake secondary cpu via resched
Applying: ARM : ux500: Fix PRCC set and clear register for soft reset
Applying: ARM: u8500: board-mop500: No ske if hw debugger
Applying: mach-ux500: platform data for pwm driver
Applying: mach-ux500: Set default values for AB8505 gpio's
Applying: ux500: input:misc:accdet: Add ab8505 accessory detect support
Applying: ARM: ux500: input: abx500-accdet: Move header file
Applying: ux500: mfd: db8500-prcmu: add function to read reset status
Applying: ux500: [ANDROID]: b2r2: Add kernel API to b2r2 and more
Applying: mach-ux500: Put b2r2 specific stuff under conditional compilation
Applying: arm: ux500: add sys/socinfo/reset_status
Applying: mach-ux500: Camera flash put under conditional compilation
Applying: ux500: ARM: u8500: power: idle test
Applying: ux500: u8500: Vibrator: Timed output vibrator driver
Applying: ux500: u5500: timed output driver for ab5500 vibrator
Applying: ux500: vibrator: Add u8520 & u9540 support
Applying: ux500: cg2900: Change the PMU_EN gpio for snowball
Applying: snowball: removing GPIO161 config for external connector

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-mali onto mainline/master - 8566 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-mali

First, rewinding head to replay your work on top of it...
Applying: mali: Add mali400 kernel module
Applying: mali: Include module.h after 3.2 update
Applying: mali: Changes for 3.3

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-modem onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-modem

First, rewinding head to replay your work on top of it...
Applying: drivers: shrm: Add shared memory (shrm) driver
Applying: modem: add mloader and trace features
Applying: shrm: Fix compilation pb after 2.6.38 merge, change ioctl to unlocked_ioctl
Applying: Fix introduced warnings
Applying: MISC: SHRM: Fix build warning
Applying: u8500: shrm: Misc updates and optimisation
Applying: shrm: sw reset: Save SW Reset Reason before reset
Applying: u8500:shrm: Fix null pointer dereference
Applying: u8500: shrm: Workaround for MSR
Applying: u8500: shrm: Update AC_Wake logic and one fix for MSR
Applying: U5500 : Mailbox logical driver.
Applying: kernel-doc: shrm: fix kernel-doc warnings
Applying: mach_ux500: Add support for mloader.
Applying: u5500 : kernel-doc for Mailbox Logical Driver
Applying: arm: ux500: common dbx500 prcmu driver api
Applying: u5500 : Change flag to GFP_ATOMIC for memory req
Applying: mach-ux500: Adapt mloader to new mem layout
Applying: misc: shrm: Remove u8500 ED support
Applying: misc: shrm: Update for header file changes 3.0
Applying: drivers: Add Modem Access Framework
Applying: drivers: modem: Add modem access driver for STE U8500
Applying: u8500: shrm: Adapt to use Modem Access framework
Applying: u8500: shrm: Move shrm to drivers/modem
Applying: Stagging : AB5500 SIM interface Driver
Applying: u8500: shrm: Add support for CIQ L2Mux channel
Applying: U8500 : driver for awaking modem on sim hot swap activity
Applying: U8500: change GPIO for SIM activity detection driver
Applying: Doc: Fixing documentation for html generation
Applying: ux500_ing05160_mailboxLD_0.1 : coverity fix in ab5500 core and mailbox
Applying: ux500_ing05160_mailboxLD_0.1 : Mailbox Logical driver update
Applying: ux500_ing05160_ab5500_sim_0.1: fix the resource leak
Applying: ux500_ing05160_mailboxPD_0.1:Lockdeb correctness fix for modem_irq
Applying: u8500-shrm: memory leakage in probe function
Applying: u8500-shrm: display useful error message in case of failure
Applying: modem: u8500-shrm: Error case not handled properly
Applying: ab5500: move to separate header
Applying: drivers: misc: Modem Audio Driver
Applying: drivers: misc: pr* log prints replaced with dev*
Applying: drivers: misc: Shared Address checking on re-open.
Applying: ux500: changed the end variable in modem trace.
Applying: u5500 : modem irq update
Applying: mbox: fix mbox crash
Applying: mbox: optimize tx path and fix bug in rx path
Applying: modem: shrm: Remove a warning
Applying: misc: shrm: Move IRQ disable to IRQ handler
Applying: ARM: shrm: Remove powersave
Applying: ARM: ux500: modem: Replace mach prcmu driver with mainlined version
Applying: drivers: modem: shrm: Block suspend when needed
Applying: u5500-mbox: Add platform driver remove
Applying: ux500-mbox: Proper shutdown of mailbox
Applying: regulators: ab8500: Add support of low voltage battery
Applying: u5500 : check for modem_itp in mloader
Applying: u8500-shrm: Initiate MSR in case of serious bug
Applying: staging: Add AB5500 SIM interface Driver Compilation
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/staging/Kconfig
Auto-merging drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Makefile
Failed to merge in the changes.
Patch failed at 0054 staging: Add AB5500 SIM interface Driver Compilation

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-modem has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	drivers/staging/Makefile
#### Counting how many more conflicts there would have been
 - tracking-igloo_kernel-modem will fail 0 more times ####


Failed to auto-resolve
HEAD is now at de576e0 U8500: Make SIM detect work on resume
Deleted branch rebasing-igloo_kernel-modem (was de576e0).

============================================================================================
Rebasing tracking-igloo_kernel-other onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-other

First, rewinding head to replay your work on top of it...
Applying: bluetooth: Improve BNEP extension headers handling
Applying: bluetooth: Add SCO parameters support for socket
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging include/net/bluetooth/bluetooth.h
Auto-merging include/net/bluetooth/hci.h
Auto-merging include/net/bluetooth/hci_core.h
Auto-merging net/bluetooth/hci_conn.c
Auto-merging net/bluetooth/hci_event.c
Auto-merging net/bluetooth/l2cap_core.c
Auto-merging net/bluetooth/lib.c
Auto-merging net/bluetooth/mgmt.c
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
Failed to merge in the changes.
Patch failed at 0002 bluetooth: Add SCO parameters support for socket

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-other has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	net/bluetooth/mgmt.c
#### Counting how many more conflicts there would have been
 - tracking-igloo_kernel-other will fail 0 more times ####


Failed to auto-resolve
HEAD is now at 9e91f82 Bluetooth: Set up correct eSCO packet type for incomming connection
Deleted branch rebasing-igloo_kernel-other (was 9e91f82).

============================================================================================
Rebasing tracking-igloo_kernel-pm onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-pm

First, rewinding head to replay your work on top of it...
Applying: mfd/db5500-prcmu: update mailbox handling
Applying: mfd/db5500-prcmu: implement event handling
Applying: mfd/db5500-prcmu: convert to platform device
Applying: mfd/db5500-prcmu: implement clock handling
Applying: mfd/db5500-prcmu: sleep handling
Applying: mfd/db5500-prcmu: implement OPP handling
Applying: mfd/db5500-prcmu: implement reset and cause
Applying: mfd/db5500-prcmu: implement EPOD handling
Applying: mfd/db5500-prcmu: spawn MFD cell for regulator
Applying: regulator/dbx500-prcmu: factor out common code
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/regulator/Kconfig
CONFLICT (content): Merge conflict in drivers/regulator/Kconfig
Auto-merging drivers/regulator/Makefile
CONFLICT (content): Merge conflict in drivers/regulator/Makefile
Auto-merging drivers/regulator/db8500-prcmu.c
CONFLICT (content): Merge conflict in drivers/regulator/db8500-prcmu.c
Auto-merging drivers/regulator/dbx500-prcmu.c
CONFLICT (add/add): Merge conflict in drivers/regulator/dbx500-prcmu.c
Auto-merging drivers/regulator/dbx500-prcmu.h
CONFLICT (add/add): Merge conflict in drivers/regulator/dbx500-prcmu.h
Failed to merge in the changes.
Patch failed at 0010 regulator/dbx500-prcmu: factor out common code

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-pm has 5 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	drivers/regulator/Kconfig
	drivers/regulator/Makefile
	drivers/regulator/db8500-prcmu.c
	drivers/regulator/dbx500-prcmu.c
	drivers/regulator/dbx500-prcmu.h
#### Counting how many more conflicts there would have been
..................... - tracking-igloo_kernel-pm will fail 21 more times ####


Failed to auto-resolve
HEAD is now at 581a241 pm: ARM: u8500: power: idle test
Deleted branch rebasing-igloo_kernel-pm (was 581a241).

============================================================================================
Rebasing tracking-igloo_kernel-security onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-security

First, rewinding head to replay your work on top of it...
Applying: add trusted execution environment (tee) driver
Applying: HCL driver implementation (hash).
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/crypto/Kconfig
CONFLICT (content): Merge conflict in drivers/crypto/Kconfig
Auto-merging drivers/crypto/Makefile
CONFLICT (content): Merge conflict in drivers/crypto/Makefile
Failed to merge in the changes.
Patch failed at 0002 HCL driver implementation (hash).

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-security has 2 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	drivers/crypto/Kconfig
	drivers/crypto/Makefile
#### Counting how many more conflicts there would have been
................... - tracking-igloo_kernel-security will fail 19 more times ####


Failed to auto-resolve
HEAD is now at bbfe829 ux500: Tee: Use hwmem for memrefs
Deleted branch rebasing-igloo_kernel-security (was bbfe829).

============================================================================================
Rebasing tracking-igloo_kernel-st-mems-sensors onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-st-mems-sensors

First, rewinding head to replay your work on top of it...
Applying: Adding l3g4200d Gyroscope
Applying: hwmon: change L3G4200D regulators name for 2.6.38
Applying: hwmon: add st lsm303dlh driver
Applying: lsm303dlh: Reboot memory content after suspend/resume
Applying: lsm303dlh: Check written values for lsm303dlh_a_write calls
Applying: lsm303dlh/l3g4200d: return count after storing mode
Applying: lsm303dlh: add DocBook documentation
Applying: hwmon: lsm303dlh_m: Fix ifdefs
Applying: hwmon: lsm303dlh_a: Fix ifdefs
Applying: hwmon: l3g4200d: Fix ifdefs
Applying: lsm303dlh: adding functions under CONFIG_SENSORS_INPUT_DEVICE
Applying: drivers:hwmon: add support for lsm303dlhc sensor
Applying: lsm303dlhc: add early suspend support
Applying: lsm303dlh: Detect chip version at run time
Applying: lsm303dlhc: fix !CONFIG_HAS_EARLYSUSPEND build
Applying: lsm303dlhc: Correct out register reading
Applying: hwmon: change regulator for accelerometer
Applying: ux500: Separate sensors and stuib
Applying: input/misc: added lps001wp as internally delivered by ST
Applying: input/misc: fix lps001wp_prs.c so it will compile (next commit)
Applying: drivers/misc: compile lps001wp using a Kconfig entry
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/input/misc/Kconfig
Auto-merging drivers/input/misc/Makefile
Applying: input/misc: Add regulator support to lps001wp
Applying: ux500: Detect accelerometer i2c address on snowball in board sensors file
Applying: sensors: Include module.h after 3.2 update
Applying: mach-ux500: sensors: Add __init directive for mop500_sensors_init()
Applying: hwmon: lsm303dlh: use regulator_set_optimum_mode()
Applying: hwmon: lsm303dlhc_a: use regulator_set_optimum_mode()
Applying: hwmon:(lsm303dlh)enable X, Y and Z axis by default
Applying: drivers: hwmon: l3g4200d: Provide gyroscope temperature via sysfs
Applying: hwmon: add mutex unlock in error cases
Applying: Documentation:add kernel-doc for sensor
Applying: lsm303dlh_m: Check for DLHC device to invert y,z
Applying: mach-ux500: lsm303dh: Read the chip_id of LSM303
Applying: drivers: Change sysfs attributes permission
Applying: lps001wp_prs:add compilation switch for work queue
Applying: [ANDROID]:input:lps001wp_prs:add regulator,sysfs
Applying: mach-ux500: sensors: Change platform data for pressure sensor
Applying: Documentation:add kernel-doc for pressure sensor
Applying: lps001wp_prs:free prs struct after regulator free
Applying: mach-ux500: sensors: move U8500 UIBs sensors management into board-mop500-sensors.c
Applying: lsm303dlhc: Include <linux/module.h>
Applying: mach-ux500: Fix, update Chipid by reading 0x0F register
Applying: lsm303dlh: add support for Android early suspend
Applying: Android:lps001wp: add early suspend,late resume
Applying: input:lps001wp_prs: Correct sysfs file permissions
Applying: hwmon: l3g4200,lsm303x: fix up the error handling
Applying: l3g4200d: change L3G4200D_FS_BIT value
Applying: sensor: board: Add U8520 & U9540 machine support

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-ste-multimedia-framework onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-ste-multimedia-framework

First, rewinding head to replay your work on top of it...
Applying: staging: Add STE mmio driver
Applying: mach-ux500: Add mmio device files and device
Applying: staging: nmf-cm: Add NMF/CM driver
Applying: staging: Add support in mmio driver for u5500
Applying: mach-ux500: Adding Support for U5500 Camera Board
Applying: ux500: mmio: Fix 2.6.38 ioctl porting
Applying: staging: nmf-cm: Update for api changes in 3.0
Applying: staging: mmio: Use local header file
Applying: staging: camera-flash: Add missing include file
Applying: mach-ux500: Fix for gpio header move
Applying: drivers:nmf-cm: Correct handling of CR register
Applying: staging: mmio: enable extended DDR usage
Applying: ARM: ux500: mmio: Correct disable mode gpio config
Applying: u5500: mmio: fix after move of mmio.h from include/linux to staging directory
Applying: Set Current Pid to Tid
Applying: u8500 CM: use vmalloc() for big allocations
Applying: U8500 CM: protect driver against MMDSP corruption
Applying: U8500 NMF-CM: rework the DMA part
Applying: U8500 NMF-CM: start DSP at 100 OPP
Applying: U8500 NMF-CM: make creation of domains more robust
Applying: U8500 NMF-CM: add support for component preloading
Applying: u5500: regulators: remove LDO S (VANA) control
Applying: U8500 NMF-CM: Increase internal fifo size
Applying: U8500 CM: make call to stopper synchronous
Applying: U8500 CM: provide MMDSP dump in case of Panic
Applying: U8500 CM: instantiate singleton in default domain
Applying: U8500 CM: Fix issue in component-preload mechanism
Applying: U8500 CM: execute services before detroying component
Applying: NMF CM Build Issue Fixed
Applying: mach-ux500: mmio: Enable Camera PMIC for S5500V2 Board
Applying: staging: camera_flash: Enable FLASH_MODE_NONE
Applying: ARM: ux500: miltimedia: Replace mach prcmu driver with mainlined version
Applying: ux500: mmio: update supply name
Applying: U8500 CM: fix 'make mrproper' issue
Applying: staging: nmf-cm: Fix after 3.1 rebase
Applying: ARM: ux500: mmio: Removes gpio_set_value warning
Applying: U8500 CM: send a DSP Panic if it's not responding
Applying: U8500 CM: always release the loadmap entry
Applying: U8500 CM: Add caller info in some panic
Applying: U8500 CM: remove useless files
Applying: U8500 CM: do not initialize ESRAM to zero
Applying: u5500: mmio: fix build failure
Applying: ux500: camera_flash: add platform data for adp1653
Applying: u8500: mmio: fix gpio_set_value warning
Applying: ARM: ux500: mmio: Corrects disable mode pin config
Applying: staging: add STE mmio driver compilation
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
Auto-merging drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Makefile
Failed to merge in the changes.
Patch failed at 0046 staging: add STE mmio driver compilation

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-ste-multimedia-framework has 2 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
#### Counting how many more conflicts there would have been
.. - tracking-igloo_kernel-ste-multimedia-framework will fail 2 more times ####


Failed to auto-resolve
HEAD is now at c842188 Ux500 CM: Correct variable initialization
Deleted branch rebasing-igloo_kernel-ste-multimedia-framework (was c842188).

============================================================================================
Rebasing tracking-igloo_kernel-storage-mmc onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-storage-mmc

First, rewinding head to replay your work on top of it...
Applying: Added commandline partitions for block devices
Applying: mach-ux500: Cumulative changes into board-*-sdi.c files
Applying: mmci: Support non-power-of-two block sizes for ux500v2 variant
Applying: mmci: Prepare for SDIO before setting up DMA job
Applying: mmci: Fix incorrect handling of HW flow control for SDIO
Applying: mmci: Put power register deviations in variant data
Applying: mmci: Provide option to configure bus signal direction
Applying: mmci: add constraints on alignment for SDIO
Applying: mmc: mmci: Change vdd_handler to a generic ios handler
Applying: MMCI: Increase max_segs from 16 to 128
Applying: mmc: mmc_test: add 4 byte alignment tests
Applying: mmc: mmci: Support MMC_PM_KEEP_POWER
Applying: ARM: ux500: SDI: enable DMA on all SDI devices
Applying: ARM: ux500: Optimize ios_handler for SD-card
Applying: ARM: ux500: Enable levelshifter at MMC_POWER_ON only
Applying: mach-ux500:u5500: Add missing CONFIG_STE_DMA40 into board-u5500-sdi.c
Applying: sdi: ux500: Coding style fixes
Applying: sdi: u5500: detect pre-R3A boards
Applying: mmc: block: Remove use of mmc_blk_set_blksize
Applying: mmc: Minimize resume-time by deferring resume
Applying: mmc: mmci: Use HWFC when possible
Applying: mmc: mmci: Fix PIO read for small SDIO packets
Applying: u5500: Move the SD/MMC card to different phy chan
Applying: ARM: ux500: Use MMC_CAP2_NO_SLEEP_CMD for eMMC devices
Applying: u5500: sdi: deprecate v1 hardware
Applying: mmc: Add old-style pwr/perm boot part locking
Applying: mmc: mmci: Do not release spinlock in request_end
Applying: mmc: mmci: Change from using legacy suspend
Applying: mmc: mmci: Cache MMCICLOCK and MMCIPOWER register
Applying: mmc: mmci: Fixup use of runtime PM and use autosuspend
Applying: mmc: mmci: Decrease current consumption in suspend
Applying: mmc: mmci: Implement PM runtime callbacks to save power
Applying: mmc: mmci: Use ios_handler to save power
Applying: mmc: init sysfs attr to fix lockdep warnings
Applying: mmc: mmci: Cleanup code for DMA handling
Applying: mmc: mmci: Do not finalize dma job at data error irq
Applying: ARM: u8500: board-sdi: Remove not needed ocr_mask
Applying: mmc: mmci: Fixup post error handling for dma
Applying: mmc: mmci: Add support for start_signal_voltage_switch
Applying: ARM: u8500: board-sdi: ios_handler handles voltage switch
Applying: ARM: u8500: board-sdi: Enable SDR12 and SDR25 for SD-card
Applying: ARM: u8500: SDI: enable ERASE_CAP on sdi2
Applying: mmc: core: Clean up after mmc_pre_req if card was removed
Applying: ARM: mmci: DMA preparations in parellel with cmd
Applying: ARM: u8500: board-sdi: Use SLEEP cmd for sdi4 (eMMC)
Applying: mmc: mmci: optimize pre_req if no previous request
Applying: mmc: mmci: Limit command frequency when using a levelshifter
Applying: mmc: mmci : Do not use polling for non removable cards
Applying: mmc: mach-ux500: Update U8520 SD-card GPIO pins

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-trace-debug onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-trace-debug

First, rewinding head to replay your work on top of it...
Applying: STM: MIPI System Trace Module char driver
Applying: trace: add STM trace hooks for printk, trace_printk, trace_function, stack trace and scheduler wakeup/context switch tracing
Applying: ARM: Make low-level printk work
Applying: arm: add printascii in printk option
Applying: ftrace: Increase number of named processes
Applying: stm: warning fix
Applying: ARM: ux500: hwreg debugfs: access DB8500 registers from debugfs entries
Applying: Boottime - A tool for automatic measurement of kernel and possible boot loader boot time.
Applying: ARM: ux500: hwreg: Tiny code clean-up
Applying: printk: don't use CONFIG_DEBUG_LL
Applying: ARM: u8500: STM: board depended code split
Applying: misc: stm: Compile System Trace Module misc driver
Applying: mach-ux500: STM: break bad dependency with hsi
Applying: mach-ux500: stm: u8500: API for PRCMU_GPIOCR register
Applying: ARM: u8500: Add control for modem and ape trace
Applying: stm: Add include linux/types.h
Applying: hwreg: ux500: Coding style fixes
Applying: u8500 : misc : stm driver not functional
Applying: boottime: Port to new 3.3 cpustat interface
Applying: mach-ux500: hwreg adaptation for u9540
Applying: stm: mach-ux500: Add support for 9540
Applying: stm: ux500: Add U8520 machine
Applying: stm: mach-ux500: Update U8520 SD-card GPIO pins
Applying: init:boottime: Increase static entries

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-usb onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-usb

First, rewinding head to replay your work on top of it...
Applying: usb: musb: ux500: add ux500 specific code for gadget side
Applying: usb: otg: ab8500-usb: workaround for connector id detection
Applying: usb: otg: ab8500-usb: let controller driver manage state
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/usb/otg/ab8500-usb.c
CONFLICT (content): Merge conflict in drivers/usb/otg/ab8500-usb.c
Failed to merge in the changes.
Patch failed at 0003 usb: otg: ab8500-usb: let controller driver manage state

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-usb has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	drivers/usb/otg/ab8500-usb.c
#### Counting how many more conflicts there would have been
............................................................... - tracking-igloo_kernel-usb will fail 63 more times ####


Failed to auto-resolve
HEAD is now at 53ff4c1 USB:Enabling autosuspend in Host audio
Deleted branch rebasing-igloo_kernel-usb (was 53ff4c1).

============================================================================================
Rebasing tracking-igloo_kernel-video onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-video

First, rewinding head to replay your work on top of it...
Applying: Porting architecture portion of av8100 driver from .35 to .38
Applying: Porting av8100 portion of video driver from .35 to .38
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/video/Kconfig
Auto-merging drivers/video/Makefile
Applying: Porting mcde portion of the video driver from .35 to .38
Applying: Moving from ioctl to unlocked_ioctl in av8100
Applying: mcde: mach-ux500: boards merge from GLK 2.6.35
Applying: mcde: mach-ux500: u5500 alignment with 2.6.35
Applying: video: mcde: Fix Kconfig to match the ux500 update
Applying: video: mcde: Fix mcde GPIO and device creation
Applying: video: mcde: Fix for overlay handling
Applying: video: mcde: Fix memory allocation failure
Applying: video: av8100: Request inputclk only if inputclk_id is valid.
Applying: video: mcde: Correct behaviour for 720x480 resolution
Applying: drivers: video: add regulator for CVBS out
Applying: video: mcde: Add missing line for CVBS TV out
Applying: video: mcde: add support to change av8100 port
Applying: video: mcde: Fix field swap for CVBS by AV8100
Applying: Porting b2r2 portion of video driver from .35 to .38
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/video/Kconfig
Auto-merging drivers/video/Makefile
Applying: Adding b2r2_blt_main.c to finish porting b2r2 portion of the video driver from .35 to .38
Applying: b2r2: Warnings fix
Applying: video: HWMEM Update API
Applying: ux500: mcde: Remove unused file
Applying: B2R2: Remove bluish tone when using yuv422i
Applying: video: HWMEM: Make user space include linux/types.h
Applying: video: mcde: Remove special SDTV watermark level
Applying: video: av8100: Fix occurences of test pattern
Applying: B2R2: Correct output for combined scale and rotation.
Applying: video: B2R2: Add support for YVU420/2_PACKED_(SEMI)_PLANAR.
Applying: video: mcde: Request dsi/dpi clocks only if needed
Applying: video: mcde: Enable esram34 only if needed
Applying: video: B2R2: Remove bluish tone when using yuv422i
Applying: video: mcde: Change overlay registers dynamically
Applying: video: mcde: Change handling of pix format
Applying: video: mcde: remove special interlaced porches
Applying: video: mcde: Add support for original NTSC
Applying: video: mcde: Fix irq_handler for chnl_disable
Applying: video: mcde: Fix first refresh when rotated
Applying: ux500: mcde: update board-configuration for U5500
Applying: video: mcde: update formatter setup for U5500
Applying: ux500: mcde: Increase DSI freq for U5500
Applying: video: mcde: Change fifo size to 640
Applying: video: av8100: Add support for DVI monitors
Applying: video: mcde: Correct issue when changing HDMI resolution
Applying: video: av8100: Add Alternative Powerup Sequence
Applying: video: mcde: fix SDTV through AB8500 flashes
Applying: ux500: mcde: Change rotbuf1/2 address for U5500
Applying: mcde: make sure all data is sent to display before next command
Applying: video: mcde_hdmi: Support for HDMI user space service
Applying: video: av8100: Add HDMI support for U5500
Applying: mach-ux500: framebuffer: Changes to be able to compile with u5500 and u8500 both enable
Applying: video: mcde: Add tripple buffer support
Applying: mcde: Fix after adding tripple buffer support
Applying: MCDE: Use fifo A for main display
Applying: video: av8100: Fix YUV port setting from startup
Applying: video: mcde: Change color convert offset fields
Applying: video: av8100: Fix colors for HDMI with a YUV port
Applying: video: av8100: Request DDR OPP
Applying: video: av8100: Filter plug event
Applying: video: av8100: Change HW response timeout values
Applying: video: mcde: Fix chnl_disable for U5500
Applying: video: mcde: Add mutex in dss
Applying: video: av8100: Control interrupts at power change
Applying: video: av8100: Add HDMI resolutions
Applying: mcde: fix build error with !EARLY_SUSPEND
Applying: video: mcde: Add dss overlay info
Applying: video: hdmi: Fix wrong return status
Applying: arm: ux500: Correct FB height when triple buffer
Applying: video: mcde: improve display configuration
Applying: video: mcde: Support YUV 422 overlay pixel format
Applying: arm: ux500: common dbx500 prcmu driver api
Applying: ux500: mcde: Use 24 bpp overlay for HDMI
Applying: video: av8100: Improve plug detection
Applying: video: mcde: Log error interrupts as debug support
Applying: video: av8100: Add suspend resume
Applying: video: mcde: fix build problems with update
Applying: video: mcde: add support for generic write commands
Applying: video: av8100: Correct hdmi display id
Applying: video: hdmi: Correct hdcp acc to documentation
Applying: av8100: Big kernel lock removed in 3.0
Applying: b2r2: Correct support for 24/32bit (A)YUV(8)888
Applying: video: mcde: Add Fictive display
Applying: video: mcde: DSI link wait for csm_running
Applying: video: mcde: Add fake color map functionality
Applying: Moving default pixel format from RGB888 to RGB565.
Applying: video: mcde: Add console semaphore
Applying: video: mcde: Allow HDMI to stay alive
Applying: ux500: regulators: update
Applying: mcde:Migrate the patches for kernel3.0
Applying: b2r2:Migrate driver to kernel 3.0
Applying: av8100:Migration to kernel 3.0 patch
Applying: mcde: mach-ux500: Migrate the patches for kernel3.0
Applying: video: mcde: Add sony display support for DB5500
Applying: video: HDMI: HDMI support for v2 board for DB5500
Applying: misc: dispdev: Migrate to kernel 3.0
Applying: misc: dispdev: Migrate to kernel 3.0
Applying: mcde: u5500: Migrate to kernel3.0
Applying: mach-ux500:mcde:Kernel 3.0 migration
Applying: mach-ux500:hdmi:Kernel 3.0 migration
Applying: hdmi: dispdev: Kernel 3.0 migration changes
Applying: mcde:Migrate the patches to kernel 3.0
Applying: hdmi: Kernel 3.0 migration changes
Applying: b2r2: Kernel 3.0 migration changes
Applying: mach-ux500: mcde: Check cpu instead of machine
Applying: video: mcde: lcdtim1 not properly set
Applying: misc: dispdev: Fix for display update
Applying: video: mcde: remove PDP config
Applying: video: mcde: correct DSI command set max pkt size
Applying: video: av8100: Add new firmware version
Applying: b2r2:Add optimized path for VUY(A)888(8) 24/32-bit
Applying: mach-ux500:u5500:MCDE platform data for kernel 3.0
Applying: mach-ux500: video: Platform data for kernel 3.0
Applying: video: mcde: request irq after init_waitqueue
Applying: video: mcde: Match DSI pkt_size to display width
Applying: video: mcde: use external TE0 for display vsync
Applying: video:mcde:Modified gpio set call to reset MCDE
Applying: video:hdmi:Modified gpio set call to reset
Applying: video: mcde: Change to mdelay
Applying: video: hdmi: Change data type
Applying: video: mcde: Fix probe of sub display
Applying: Dispdev: Removed the UNINIT error
Applying: video: mcde: Correct DSI startup sequence
Applying: arm: ux500: video: Configure dsi clocks and regulators
Applying: video: mcde: Add channel states
Applying: video: mcde: fix pixelwatermarklevel
Applying: video: mcde: Change timing for DPI formatter
Applying: ARM: ux500: video: Replace mach prcmu driver with mainlined version
Applying: ux500: mcde: use constant device ids
Applying: ux500: mcde: update supply names
Applying: video: hdmi: Fix fb creation failure
Applying: mach-ux500: mcde: Add prefix to mcde board func
Applying: u5500: mcde: Fix build errors
Applying: mcde: Disable power down for normal blanking.
Applying: mcde: Add implementation for colreg and cmap.
Applying: av8100: Add av8100 firmware to kernel firmware.
Applying: ux500: mcde: Dont probe for uib on snowball
Applying: ux500: mcde: Remove unnessesary delay for av8100
Applying: video: mcde: Add fps logging
Applying: video: av8100: Debug new chip version
Applying: video: av8100: Fix wrong loop max value
Applying: video: av8100: Improve error handling
Applying: arm: ux500: fix compilation errors
Applying: video: av8100: Change color convert rgb->denc
Applying: video: mcde: Fix fps logging
Applying: ux500: mcde: Add UIB8500R3 display support
Applying: video: mcde: Remove prepare for update
Applying: video: mcde: Add generic suspend/resume for MCDE bus
Applying: video: mcde: Add Samsung S6D16D0 driver
Applying: video: mcde: Add generic DSI platform data
Applying: ux500: mcde: Replace generic driver with Samsung
Applying: video: mcde: Handle ACKNOWLEDGE_WITH_ERR in read
Applying: video: mcde: get_pkt_div should use port mode
Applying: video: mcde: Fix suspend oops in Android
Applying: ux500: mcde: Add correct reg id for sony display
Applying: video: mcde: Move driver data to sony display
Applying: ux500: mcde: Remove sony display data from board
Applying: video: mcde: Remove sony display platform data
Applying: ux500: mcde: Remove unused code
Applying: ux500: mcde: Remove unused MCDE auto sync
Applying: video: mcde: Remove unused MCDE auto sync
Applying: misc: Add dispev driver compilation
Applying: mach-ux500: Include mach-ux500 Display specifics config flags
Applying: video: Include module.h after 3.2 update
Applying: mach-ux500: mcde: Change default color for hdmi fb.
Applying: av8100: Update firmware
Applying: video: mcde: Include export.h after 3.2 update
Applying: ux500: mcde: Shift the rotation buffer address
Applying: video: mcde: Remove MCDE 3_0_5 version support
Applying: video: mcde: Remove MCDE_1_0_4 version support
Applying: video: mcde: Remove hardware version handling
Applying: video: mcde: Remove hardware specifics variables
Applying: video: mcde: Update mcde_regs.h
Applying: video: mcde: Add support for 4_1_3 hardware
Applying: video: av8100: Update suspend resume method
Applying: video: av8100: free irq when powerdown
Applying: ux500: mcde: Remove unnecessary MCDE fbdev update
Applying: ux500: mcde: Remove DPI display device
Applying: ux500: mcde: Remove DSI generic device
Applying: ux500: mcde: Remove static board configuration
Applying: video: av8100: Remove fb on/off machine dependency
Applying: mach: ux500: Make fb create code generic
Applying: video: mcde: use DSI display with one data lane
Applying: b2r2: Add support for blending on background image
Applying: video: mcde: Add host_eot_gen property
Applying: b2r2: Correct scaling to multi-buffer format
Applying: ARM: ux500: mcde: Coding style fixes
Applying: video: mcde: add synch source formatter
Applying: video: mcde: add DSI video mode support
Applying: video: mcde: Configure the correct output fifosize
Applying: b2r2: Modify src and dst rect to avoid clipping
Applying: mcde: Read mcde_clk_rate, used in dsi_delay0
Applying: b2r2: Improve image quality for large zoom blits
Applying: drivers: video: av8100: Stop printing chip version at every resume
Applying: video: mcde: Add new display id for Sony driver.
Applying: video: mcde: Avoid set_video_mode when in OFF state
Applying: video: mcde: Enter ULPM before dsi is disabled
Applying: b2r2: Support in driver for multiple b2r2 devices
Applying: video: mcde: Fix build warning
Applying: video: mcde: Handle MCDE_DISPLAY_PM_ON in probe
Applying: video: mcde: Update power on/off sequence for Sony
Applying: u8500: mcde: Wrong gpio used for sony display
Applying: arm: ux500: Add new dsi clocks for mcde
Applying: video: mcde: Add dsi/dpi freq settings
Applying: misc: compdev added
Applying: misc: compdev: Handle rotation
Applying: video: mcde: Overlay register access race
Applying: header files: install STE video headers
Applying: video: compdev: Add include <linux/module.h> for 3.2
Applying: mach-ux500: mcde: Change WARN_ON to pr_warning for unknown UI board
Applying: mcde: ab8500: Changes for porting on 3.3
Applying: video: b2r2: Fix kernel headers check problem
Applying: video: mcde: Hide display physical orientation
Applying: ux500: mcde: Hide display physical orientation
Applying: ux500: Remove old rotation configs
Applying: b2r2: Check return value from debugfs calls
Applying: video: mcde: Correct ULPM sequence
Applying: video: mcde: Always enter ULPM in dsilink_disable
Applying: video: mcde: Add delay after ENTER_SLEEP
Applying: b2r2: Possible to set YUV range
Applying: video: mcde: add rotbufsize
Applying: video: mcde: send SET_TEAR_ON from display driver
Applying: ux500: mcde: remove synchronized_update
Applying: video: mcde: remove synchronized_update
Applying: video: mcde: use hw frame trig from mcde formatter
Applying: ux500: mcde: use software trig for display refresh
Applying: video: mcde: enable rotbufsize
Applying: video: mach-ux500: Add support for 9540
Applying: mcde: ux500: Add U8520 machine
Applying: video: mcde: Add set_rotation to display_av8100.c
Applying: video: mcde: optimized stripe calculation
Applying: video: mcde: remove compile time warnings
Applying: video: Correction for scan mode in sony_acx424akp
Applying: ux500: mcde: Changing sony_acx424akp orientation
Applying: dispdev: don't write to read-only memory
Applying: b2r2: Improve image quality for HDMI clone
Applying: video: [ANDROID]: b2r2: Add kernel API to b2r2 and more
Applying: video: mcde: Release ESRAM regulator
Applying: misc: compdev: Updated for new kernel composition
Applying: misc: clonedev: New device for cloning
Applying: misc: compdev: Correction for overlay crash
Applying: mcde: hdmi: Workaround to don't use the clock framework for MCDE on Snowball

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-wlan onto mainline/master - 6610 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-wlan

First, rewinding head to replay your work on top of it...
Applying: WLAN: Initial commit of the STM CW1200 WLAN driver.
Applying: WLAN: CW1200: Support for GPIO-based IRQ.
Applying: WLAN: CW1200: Power management is implemnted.
Applying: WLAN: CW1200: Support for HREF/HREFV60/Snowball.
Applying: WLAN: CW1200: Fix for a crash in cfg80211_get_drvinfo() on ifconfig.
Applying: WLAN: CW1200: HT: ampdu_action is implemented.
Applying: cw1200: Set up max_scan_ie_len
Applying: cw1200: Workaround against a bug in Code Sourcery arm2010q1.
Applying: cw1200: Workaround against a problem with DMA on ux500 platform.
Applying: cw1200: Integration with mach-ux500
Applying: cw1200: Spin lock usage review.
Applying: wlan: cw1200: .flush mac80211 API is implemented.
Applying: wlan: cw1200: Reenable filtering.
Applying: cw1200: Request SDIO pins at device registration.
Applying: wlan: cw1200: Add cut2.2 support
Applying: cw1200: listening mode implementation
Applying: cw1200: Align TX buffers for DMA.
Applying: cw1200: Add regulator support
Applying: ux500: irq: wlan: Fix multi boards support & put board common parts to mach/irqs.h
Applying: cw1200: Expose driver internals on DebugFS.
Applying: cw1200: throughput optimization.
Applying: cw1200: fix for locked datapath after deauth.
Applying: cw1200: Support of WSM293+ firmware in STA mode.
Applying: cw1200: AMSDU debug statistics
Applying: cw1200: Multi-tx confirmation is implemented.
Applying: cw1200: stylistic change: move RX callback to txrx.c
Applying: cw1200: 11n verification and bugfixing.
Applying: cw1200: New option for 5GHz support.
Applying: cw1200: Document and optimize device reset sequence.
Applying: cw1200: rate policy optimization.
Applying: cw1200: Remove link to platform_device from platform_data.
Applying: cw1200: throughput optimization and fine-tuning.
Applying: WLAN: Add cw1200_plat.h to mach-ux500 includes
Applying: u8500: Update board-mop500-wlan
Applying: WLAN: remove GPIO_IRQ conditional checks
Applying: WLAN: u5500: Add wlan init to u5500 board file
Applying: WLAN: u5500: Add new wlan platform file for u5500
Applying: mach-ux500: wlan: Add prefix to wlan board func
Applying: cw1200: API change for ieee80211_channel_to_frequency
Applying: cw1200: Fix wrongly reported band.
Applying: cw1200: enabling WAPI support
Applying: cw1200: Remove unnecessary delays in cw1200_sdio_on.
Applying: cw1200: Document and optimize device reset sequence.
Applying: cw1200: Dynamic power save is offloaded to the firmware.
Applying: cw1200: Syncing WSM API usage with firmware team.
Applying: cw1200: Aligning mac80211 API with compat-wireless-3.0-rc4-1
Applying: cw1200: Driver should not report MCS rates to mac80211.
Applying: cw1200: Multicast filtering support.
Applying: cw1200: Removed obsolete code (software keepalive).
Applying: cw1200: Wakeup on wireless (WoW) is implemented.
Applying: cw1200: Fix for firmware exception on requeued TXed frames.
Applying: cw1200: ARP ipv4 filtering
Applying: cw1200: Cancel connection and beacon loss works
Applying: cw1200: Fix for buffered multicasts in AP-PS mode.
Applying: cw1200: Off-channel sending of action frames is implemented.
Applying: cw1200: Support for non-Greenfield STA protection
Applying: cw1200: Support for limited wowlan functionalities
Applying: cw1200: Fix for buffered multicasts in AP-PS mode: bugfix.
Applying: cw1200: Workaround against cyclic requeue of multicast frames.
Applying: cw1200: Removing obsolete code which blocked power management by default.
Applying: cw1200: Remove some spam from logging.
Applying: cw1200: Minor fixes.
Applying: cw1200: Fix for a crash in cw1200_join_work.
Applying: cw1200: Fix for driver hang at join timeout (scan in progress)
Applying: cw1200: Allow proberesponse frame to be txed
Applying: cw1200: P2P power save support
Applying: cw1200: Do join if upper layer is trying to TX in monitor mode.
Applying: cw1200: Missing interrupt detection.
Applying: cw1200: Allow TXing in monitor mode
Applying: cw1200: Purge cfg80211 beacon cache before authentication.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging net/mac80211/ieee80211_i.h
CONFLICT (content): Merge conflict in net/mac80211/ieee80211_i.h
Auto-merging net/mac80211/mlme.c
CONFLICT (content): Merge conflict in net/mac80211/mlme.c
Auto-merging net/mac80211/work.c
CONFLICT (content): Merge conflict in net/mac80211/work.c
Failed to merge in the changes.
Patch failed at 0070 cw1200: Purge cfg80211 beacon cache before authentication.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-wlan has 3 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	net/mac80211/ieee80211_i.h
	net/mac80211/mlme.c
	net/mac80211/work.c
#### Counting how many more conflicts there would have been
...................... - tracking-igloo_kernel-wlan will fail 22 more times ####


Failed to auto-resolve
HEAD is now at 5cd3861 cw1200: wakelock: Change for new Google wakelock implementation over PM sleep
Deleted branch rebasing-igloo_kernel-wlan (was 5cd3861).

============================================================================================
Rebasing tracking-mainline-master onto mainline/master - 0 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-mainline-master

Current branch rebasing-mainline-master is up to date.

Rebase successful

Rebase complete:
	9 failed rebase(s) - please rebase these individually
		tracking-igloo_kernel-core
		tracking-igloo_kernel-input
		tracking-igloo_kernel-modem
		tracking-igloo_kernel-other
		tracking-igloo_kernel-pm
		tracking-igloo_kernel-security
		tracking-igloo_kernel-ste-multimedia-framework
		tracking-igloo_kernel-usb
		tracking-igloo_kernel-wlan
	15 successful rebase(s)
		tracking-igloo_kernel-audio
		tracking-igloo_kernel-caif
		tracking-igloo_kernel-cg2900
		tracking-igloo_kernel-cg2900-fm
		tracking-igloo_kernel-dma
		tracking-igloo_kernel-gpio
		tracking-igloo_kernel-hsi
		tracking-igloo_kernel-hwmem
		tracking-igloo_kernel-mach-plat
		tracking-igloo_kernel-mali
		tracking-igloo_kernel-st-mems-sensors
		tracking-igloo_kernel-storage-mmc
		tracking-igloo_kernel-trace-debug
		tracking-igloo_kernel-video
		tracking-mainline-master