linux-linaro (2.6.35-1001.5) maverick; urgency=low
[ John Rigby ]
* New upstream trees
Merge of linaro_merge_100811 and Ubuntu-2.6.35-15.21
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
linaro_merge_100811 added sdp4430_leds_gpio to sdp4030_devices
Ubuntu 2.6.35-15.21 added sdp4430_nop_usb_device to sdp4030_devices
resolution was to just add both
* Fold in packaging from 2.6.35-1000.4
* [Config] Update configs for new upstream
* omap3 nand: missing param to gpmc_prefetch_reset
-- John Rigby <email address hidden> Wed, 11 Aug 2010 14:20:28 -0600