Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/karmic/linux-fsl-imx51
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

14. By Andy Whitcroft

[ Andy Whitcroft ]

* rebase to Ubuntu-2.6.31-14.46
* [Config] update configs since rebase to Ubuntu-2.6.31-14.46
* lirc update dropped module lirc_mceusb2

[ Upstream Kernel Changes ]

* mxc spi: fix spi driver for 2.6.31
  - LP: #427289, #446140

[ Ubuntu: 2.6.31-14.46 ]

* reinstate armel.mk with no flavours
  - LP: #449637
* [Upstream] elevator: fix fastfail checks to allow merge of readahead
  - LP: #444915
* [Upstream] block: silently error unsupported empty barriers too
  - LP: #420423
* SAUCE: AppArmor: Fix mediation of "deleted" paths
  - LP: #415632
* [Config] CONFIG_X86_MCE
* Revert "appletalk: Fix skb leak when ipddp interface is not loaded,
  CVE-2009-2903" - Use patch from which is slightly different.
* x86: fix csum_ipv6_magic asm memory clobber
* tty: Avoid dropping ldisc_mutex over hangup tty re-initialization
* x86: Don't leak 64-bit kernel register values to 32-bit processes
* tracing: correct module boundaries for ftrace_release
* ftrace: check for failure for all conversions
* futex: fix requeue_pi key imbalance
* futex: Move exit_pi_state() call to release_mm()
* futex: Nullify robust lists after cleanup
* futex: Fix locking imbalance
* NOHZ: update idle state also when NOHZ is inactive
* ima: ecryptfs fix imbalance message
* libata: fix incorrect link online check during probe
* sound: via82xx: move DXS volume controls to PCM interface
* ASoC: WM8350 capture PGA mutes are inverted
* KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID
* KVM: VMX: flush TLB with INVEPT on cpu migration
* KVM: fix LAPIC timer period overflow
* KVM: SVM: Fix tsc offset adjustment when running nested
* KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly
* net: Fix wrong sizeof
* mm: add_to_swap_cache() must not sleep
* sis5513: fix PIO setup for ATAPI devices
* PIT fixes to unbreak suspend/resume (bug #14222)
* IMA: open new file for read
* ACPI: Clarify resource conflict message
* ACPI: fix Compaq Evo N800c (Pentium 4m) boot hang regression
* net: restore tx timestamping for accelerated vlans
* net: unix: fix sending fds in multiple buffers
* tun: Return -EINVAL if neither IFF_TUN nor IFF_TAP is set.
* net: Fix sock_wfree() race
* smsc95xx: fix transmission where ZLP is expected
* sky2: Set SKY2_HW_RAM_BUFFER in sky2_init
* appletalk: Fix skb leak when ipddp interface is not loaded
* ax25: Fix possible oops in ax25_make_new
* ax25: Fix SIOCAX25GETINFO ioctl
* sit: fix off-by-one in ipip6_tunnel_get_prl
* Linux
* drm/i915: Fix FDI M/N setting according with correct color depth
  - LP: #416792

[ Ubuntu: 2.6.31-13.45 ]

* [Config] Add sd_mod to scsi-modules udeb for powerpc
* SAUCE: Update to LIRC 0.8.6
  - LP: #432678
* [Config] CONFIG_X86_PAT=y
* [Config] Add armel arch to linux-libc-dev arches.
  - LP: #449637
* e1000e: swap max hw supported frame size between 82574 and 82583
* drm/i915: Initialize HDMI outputs as HDMI connectors, not DVI.
  - LP: #392017
* ALSA: hda - Add quirks for some HP laptops
  - LP: #449742
* ALSA: hda - Add support for HP dv6
  - LP: #449742

[ Ubuntu: 2.6.31-13.44 ]

* sgi-gru: Fix kernel stack buffer overrun, CVE-2009-2584
* appletalk: Fix skb leak when ipddp interface is not loaded,
  Note - This patch causes an ABI change in the symbol aarp_send_ddp
  which I'm ignoring.

13. By Andy Whitcroft

[ Andy Whitcroft ]

fix FTBFS due to sound being built in

12. By Andy Whitcroft

[ Alan Tull ]

* SAUCE: IMX51: A hack which allows the sound driver to initialize.

[ Amit Kucheria ]


[ Andy Whitcroft ]

* rebase to Ubuntu-2.6.31-13.42
* rebase to Ubuntu-2.6.31-13.43

[ Brad Figg ]

* CONFIG: IMX51: change SGTL5000 driver to be builtin instead of a

[ Colin Watson ]

* Use section 'admin' rather than 'base'

[ Jeremy Kerr ]

* SAUCE: drivers/net/fec: Convert to a platform bus driver
  - LP: #438687

[ Tim Gardner ]

  - LP: #416325

[ Upstream Kernel Changes ]

* ENGR00107785 sgtl5000: adc power savings
* sgtl5000 audio: more porting to 2.6.31
* sgtl5000: add line in function

[ Ubuntu: 2.6.31-13.43 ]

* Revert "[Upstream] acerhdf: Limit modalias matching to supported
* Use section 'admin' rather than 'base'
* SAUCE: AppArmor: Set error code after structure initialization.
  - LP: #427948
* SAUCE: AppArmor: Fix off by 2 error in getprocattr mem allocation
  - LP: #446595
* SAUCE: Add sr_mod to the scsi-modules udeb for powerpc
* [Upstream] acerhdf: Limit modalias matching to supported boards
  (supersedes previous revert made by Andy Whitcroft)
  - LP: #435958

[ Ubuntu: 2.6.31-13.42 ]

* SAUCE: (drop after 2.6.31) input: Add support for filtering input
  - LP: #430809
* SAUCE: (drop after 2.6.31) dell-laptop: Trigger rfkill updates on wifi
  toggle switch press
  - LP: #430809
* SAUCE: Raise the default console 'quiet' level to 2
  This supresses all but critical and emergency level messages.
* TTY: fix typos
* Linux
* V4L/DVB (12439): cx88: add support for WinFast DTV2000H rev. J
  - LP: #433904

[ Ubuntu: 2.6.31-12.41 ]

  - LP: #416325
  The original patch failed to work for amd64.
  - LP: #430694
* ALSA: hda - Add a white-list for MSI option
  Upstream cherry-pick: Infrastructure support for #445580
* ALSA: hda - Add HP Pavilion dv4t-1300 to MSI whitelist
  - LP: #445580
* ALSA: intel8x0 - Mute External Amplifier by default for Sony VAIO
  - LP: #410933
* ALSA: intel8x0 - Mute External Amplifier by default for Sony VAIO
  - LP: #410933

[ Ubuntu: 2.6.31-12.40 ]

  - LP: #430694
* SAUCE: Use MODULE_IMPORT macro to tie intel_agp to i915
  - LP: #430694
* V4L/DVB (12352): gspca - vc032x: Fix mi1310_soc preview and LED
  - LP: #310760

11. By Andy Whitcroft

[ Amit Kucheria ]

* [Config] Disable LMPCM_USB
* [Config] Disable rt3070sta in staging
  - LP: #423767
* [Config] Add asix to d-i modules
  - LP: #431283
* [Config] Enable MXC_SAHARA
* ARM: IMX51: Change default_bpp to 32
  - LP: #440104

[ Andy Whitcroft ]

* SAUCE: ubuntu-insert-changes -- follow abstracted debian
* rebase to Ubuntu-2.6.31-12.39
* rt3070sta has been disabled

[ Tim Gardner ]

* [Config] Added cpio as a build dependency.

[ Upstream Kernel Changes ]


[ Ubuntu: 2.6.31-12.39 ]

* install the full changelog with the binary package
* changelog -- explicitly note rebases and clean history
* Revert "SAUCE: (drop after 2.6.31) Disable iwl-1000 series wireless
* Revert "SAUCE: (drop after 2.6.31) eCryptfs: Prevent lower dentry from
  going negative during unlink"
* Revert "SAUCE: (drop after 2.6.31) em28xx: ir-kbd-i2c init data needs a
  persistent object"
* Revert "SAUCE: (drop after 2.6.31) saa7134: ir-kbd-i2c init data needs
  a persistent object"
* Revert "drm/i915: Check that the relocation points to within the
* Revert "drm/i915: fix tiling on IGDNG"
* Revert "Driver core: add new device to bus's list before probing"
* Revert "HID: completely remove apple mightymouse from blacklist"
* Revert "KVM: x86: check for cr3 validity in ioctl_set_sregs"
  All reverts superseded by corresponding v2.6.31.2 patches
* [Config] Add d101m_ucode.bin to d-i/firmware/nic-modules
  - LP: #439456
* [Config] Enabled CONFIG_SND_HDA_HWDEP
  - LP: #443117
* [Config] Add cpio as a build dependency.
* [Config] Set default I/O scheduler back to CFQ for desktop flavours
  - LP: #381300
* KVM: VMX: Fix EPT with WP bit change during paging
* pata_amd: do not filter out valid modes in nv_mode_filter
* p54usb: add Zcomax XG-705A usbid
* x86: Increase MIN_GAP to include randomized stack
* serial: bfin_5xx: fix building as module when early printk is enabled
* USB: option.c Add support for ZTE AC2726 EVDO modem
* USB: option: TELIT UC864G support
* video: s3c_fb.c: fix build with CONFIG_HOTPLUG=n
* kbuild: fix cc1 options check to ensure we do not use -fPIC when
* drivers/mfd/ab3100-core.c: fix powerpc build error
* thinkpad-acpi: don't ask about brightness_mode for fw. 1V and 1R
* ACPI: pci_slot.ko wants a 64-bit _SUN
* fbcon: only unbind from console if successfully registered
* kallsyms: fix segfault in prefix_underscores_count()
* sisfb: change SiS_DDC_Port type to SISIOADDRESS
* mmc_spi: fail gracefully if host or card do not support the switch
* alpha: AGP update (fixes compile failure)
* fs: make sure data stored into inode is properly seen before unlocking
  new inode
* eCryptfs: Handle unrecognized tag 3 cipher codes
* eCryptfs: Check for O_RDONLY lower inodes when opening lower files
* eCryptfs: Filename encryption only supports password auth tokens
* eCryptfs: Validate global auth tok keys
* eCryptfs: Prevent lower dentry from going negative during unlink
* Re-enable Lanman security
* xen: make -fstack-protector work under Xen
* xen: only enable interrupts while actually blocking for spinlock
* xen: use stronger barrier after unlocking lock
* xen: check EFER for NX before setting up GDT mapping
* perf_counter: Fix perf_copy_attr() pointer arithmetic
* perf tools: Fix buffer allocation
* tty: serial/pcmcia: add ID for Advantech card
* PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()
* PM / yenta: Fix cardbus suspend/resume regression
* sony-laptop: check for rfkill hard block at load time
* nilfs2: fix missing zero-fill initialization of btree node cache
* ar9170usb: add usbid for TP-Link TL-WN821N v2
* mtd: nand: fix ECC Correction bug for SMC ordering for NDFC driver
* mtd: ofpart: Check availability of reg property instead of name
* mtd: cfi_cmdset_0002: add 0xFF intolerance for M29W128G
* USB: serial: ftdi_sio: new hardware support - hameg power supply
* USB: add PIDs for FTDI based OpenDCC hardware
* USB: serial: ftdi: handle gnICE+ JTAG adaptors
* USB: CDC WDM driver doesn't support non-blocking reads
* USB: fix cdc-acm regression in open
* cdc_acm: Fix to use modern speed interfaces
* tty: remove dtr/rts use from the driver open methods
* tty: gigaset: really fix chars_in_buffer
* kaweth: Fix memory leak in kaweth_control()
* x86: SGI UV: Fix IPI macros
* USB: serial: pl2303: new hardware support - sanwa multimeter
* USB: storage: fix a resume path GFP_NOIO must be used
* USB: usb-storage fails to attach to Huawei Datacard cdrom device
* USB: usbtmc: sanity checks for DEV_DEP_MSG_IN urbs
* USB: sl811-hcd: Fix device disconnect:
* drm/i915: remove restore in resume
* drm/i915: Only destroy a constructed mmap offset
* drm/i915: prevent FIFO calculation overflows on 32 bits with high
* drm/i915: Add buffer to inactive list immediately during fault
* drm/i915: Check that the relocation points to within the target
* drm/i915: Fix typo for wrong LVDS clock setting on IGDNG
* drm/i915: Fix SSC frequence for IGDNG
* drm/i915: Remove DAC disable in CRT force detect on IGDNG
* drm/i915: Fix LVDS panel fitting on Arrandale
* drm/I915: Use the CRT DDC to get the EDID for DVI-connector on Mac
* drm/i915: fix tiling on IGDNG
* agp/intel: Fix the pre-9xx chipset flush.
* nfsd4: fix null dereference creating nfsv4 callback client
* can: fix NOHZ local_softirq_pending 08 warning
* ahci: restore pci_intx() handling
* pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume
* net ax25: Fix signed comparison in the sockopt handler
* net: Make the copy length in af_packet sockopt handler unsigned
* pty_write: don't do a tty_wakeup() when the buffers are full
* KVM: fix cpuid E2BIG handling for extended request types
* KVM: MMU: fix missing locking in alloc_mmu_pages
* KVM: MMU: fix bogus alloc_mmu_pages assignment
* KVM: Protect update_cr8_intercept() when running without an apic
* Fix NULL ptr regression in powernow-k8
* perf tools: do not complain if root is owning perf.data
* netfilter: nf_nat: fix inverted logic for persistent NAT mappings
* netfilter: nf_conntrack: netns fix re reliable conntrack event delivery
* netfilter: bridge: refcount fix
* netfilter: ebt_ulog: fix checkentry return value
* ath5k: Wakeup fixes
* ath5k: do not release irq across suspend/resume
* Driver core: add new device to bus's list before probing
* tty: Add a full port_close function
* tty: USB hangup is racy
* tty: USB can now use the shutdown method for kref based freeing of
* hwmon: (asus_atk0110) Add maintainer information
* tty: USB serial termios bits
* usb-serial: change referencing of port and serial structures
* usb-serial: put subroutines in logical order
* usb-serial: change logic of serial lookups
* usb-serial: acquire references when a new tty is installed
* usb-serial: fix termios initialization logic
* usb-serial: rename subroutines
* usb-serial: add missing tests and debug lines
* usb-serial: straighten out serial_open
* USB serial: update the console driver
* USB: xhci: Work around for chain bit in link TRBs.
* USB: xhci: Fix slot and endpoint context debugging.
* USB: xhci: Configure endpoint code refactoring.
* USB: xhci: Set correct max packet size for HS/FS control endpoints.
* USB: xhci: Support full speed devices.
* USB: xhci: Handle stalled control endpoints.
* USB: xhci: Add quirk for Fresco Logic xHCI hardware.
* USB: xhci: Make TRB completion code comparison readable.
* USB: xhci: Handle babbling endpoints correctly.
* USB: xhci: Don't touch xhci_td after it's freed.
* USB: xhci: Check URB's actual transfer buffer size.
* USB: xhci: Check URB_SHORT_NOT_OK before setting short packet status.
* USB: xhci: Set -EREMOTEIO when xHC gives bad transfer length.
* USB: xhci: Support interrupt transfers.
* USB: Fix SS endpoint companion descriptor parsing.
* /proc/kcore: work around a BUG()
* hugetlb: restore interleaving of bootmem huge pages (2.6.31)
* page-allocator: limit the number of MIGRATE_RESERVE pageblocks per zone
* mm: munlock use follow_page
* mm: fix anonymous dirtying
* mmap: avoid unnecessary anon_vma lock acquisition in vma_adjust()
* Fix idle time field in /proc/uptime
* drm/i915: Handle ERESTARTSYS during page fault
* em28xx: ir-kbd-i2c init data needs a persistent object
* saa7134: ir-kbd-i2c init data needs a persistent object
* powerpc/8xx: Fix regression introduced by cache coherency rewrite
* powerpc: Fix incorrect setting of __HAVE_ARCH_PTE_SPECIAL
* HID: completely remove apple mightymouse from blacklist
* mptsas : PAE Kernel more than 4 GB kernel panic
* NOMMU: Fix MAP_PRIVATE mmap() of objects where the data can be mapped
* iwlwifi: Handle new firmware file with ucode build number in header
* iwlwifi: update 1000 series API version to match firmware
* iwlagn: modify digital SVR for 1000
* iwlwifi: traverse linklist to find the valid OTP block
* iwlwifi: fix unloading driver while scanning
* Linux

[ Ubuntu: 2.6.31-11.38 ]

* [Upstream] acerhdf: Limit modalias matching to supported boards
  - LP: #435958
* [Config] Added sata_via to d-i/modules/sata-modules
  - LP: #434827
* SAUCE: (drop after 2.6.31) Disable iwl-1000 series wireless adapters
  - LP: #439285
* [Upstream] i915: Fix i2c init message
  - LP: #409361
* [Config] Add sym53c8xx.ko to virtual sub-flavour
  - LP: #439415
* sched: Disable NEW_FAIR_SLEEPERS for now
  - LP: #436342
* ACPI video: ignore buggy _BQC
* ACPI video: work-around BIOS AML bug in _BQC
  - LP: #428910
* ALSA: hda - Added quirk to enable sound on Toshiba NB200
  - LP: #438318

[ Ubuntu: 2.6.31-11.37 ]

* [Config] Increase kernel log buffer to 256K for amd64 flavours
  - LP: #424810
* [Config] Set HZ=100 for amd64 flavours
  - LP: #438234
* [Upstream] e1000e: Emit notice instead of an error when
  pci_enable_pcie_error_reporting() fails
  - LP: #436370
* n_tty: honor opost flag for echoes
* n_tty: move echoctl check and clean up logic
  - LP: #438310
* Revert "[Upstream] drm/i915: Check that the relocation points to within
  the target" - Use upstream cherry-pick.
* drm/i915: Check that the relocation points to within the target
  - LP: #429241
* drm/i915: fix tiling on IGDNG
* drm/i915: add B43 chipset support
* agp/intel: Add B43 chipset support
  Intel request from kernel team mailing list.
* HID: completely remove apple mightymouse from blacklist
  - LP: #428111

10. By Andy Whitcroft

[ Andy Whitcroft ]

* rebase to Ubuntu-2.6.31-11.36

[ Ubuntu: 2.6.31-11.36 ]

* SAUCE: (drop after 2.6.31) em28xx: ir-kbd-i2c init data needs a
  persistent object
* SAUCE: (drop after 2.6.31) saa7134: ir-kbd-i2c init data needs a
  persistent object
* [Upstream] ALSA: hda - Add another entry for Nvidia HDMI device
  - LP: #416482
* SAUCE: (drop after 2.6.31) eCryptfs: Prevent lower dentry from going
  negative during unlink
* sg: fix oops in the error path in sg_build_indirect()
* mpt2sas : Rescan topology from Interrupt context instead of work thread
* mpt2sas: Prevent sending command to FW while Host Reset
* mpt2sas: setting SDEV into RUNNING state from Interrupt context
* mpt2sas: Raid 10 Volume is showing as Raid 1E in dmesg
* SCSI: fix oops during scsi scanning
* SCSI: libsrp: fix memory leak in srp_ring_free()
* cfg80211: fix looping soft lockup in find_ie()
* ath5k: write PCU registers on initial reset
* binfmt_elf: fix PT_INTERP bss handling
* TPM: Fixup boot probe timeout for tpm_tis driver
* md: Fix "strchr" [drivers/md/dm-log-userspace.ko] undefined!
* x86/amd-iommu: fix broken check in amd_iommu_flush_all_devices
* fix undefined reference to user_shm_unlock
* perf_counter: Fix buffer overflow in perf_copy_attr()
* perf_counter: Start counting time enabled when group leader gets
* powerpc/perf_counters: Reduce stack usage of power_check_constraints
* powerpc: Fix bug where perf_counters breaks oprofile
* powerpc/ps3: Workaround for flash memory I/O error
* block: don't assume device has a request list backing in nr_requests
* agp/intel: remove restore in resume
* ALSA: cs46xx - Fix minimum period size
* ASoC: Fix WM835x Out4 capture enumeration
* sound: oxygen: work around MCE when changing volume
* mlx4_core: Allocate and map sufficient ICM memory for EQ context
* perf stat: Change noise calculation to use stddev
* x86: Fix x86_model test in es7000_apic_is_cluster()
* x86/i386: Make sure stack-protector segment base is cache aligned
* PCI: apply nv_msi_ht_cap_quirk on resume too
* x86, pat: Fix cacheflush address in change_page_attr_set_clr()
* ARM: 5691/1: fix cache aliasing issues between kmap() and kmap_atomic()
  with highmem
* KVM guest: do not batch pte updates from interrupt context
* KVM: Fix coalesced interrupt reporting in IOAPIC
* KVM: VMX: Check cpl before emulating debug register access
* KVM guest: fix bogus wallclock physical address calculation
* KVM: x86: Disallow hypercalls for guest callers in rings > 0
* KVM: VMX: Fix cr8 exiting control clobbering by EPT
* KVM: x86 emulator: Implement zero-extended immediate decoding
* KVM: MMU: make __kvm_mmu_free_some_pages handle empty list
* KVM: x86 emulator: fix jmp far decoding (opcode 0xea)
* KVM: limit lapic periodic timer frequency
* libata: fix off-by-one error in ata_tf_read_block()
* PCI quirk: update 82576 device ids in SR-IOV quirks list
* PCI: Unhide the SMBus on the Compaq Evo D510 USDT
* powerpc/pseries: Fix to handle slb resize across migration
* Linux

[ Ubuntu: 2.6.31-10.35 ]

* remove the tlsup driver
* remove lmpcm logitech driver support
* Add 3 missing files to prerm remove file list
  - LP: #345623, #415832
* [Upstream] drm/i915: Check that the relocation points to within the
  - LP: #429241
* [Config] Set CONFIG_EXT4_FS=y on ports architectures
* SAUCE: Added quirk to recognize GE0301 3G modem as an interface.
  - LP: #348861
* Revert "[Upstream] ACPI: Add Thinkpad W500, W700, & W700ds to OSI(Linux) white-list"
* Revert "[Upstream] ACPI: Add Thinkpad R400 & Thinkpad R500 to OSI(Linux) white-list"
* Revert "[Upstream] ACPI: Add Thinkpad X300 & Thinkpad X301 to OSI(Linux) white-list"
* Revert "[Upstream] ACPI: Add Thinkpad X200, X200s, X200t to OSI(Linux) white-list"
* Revert "[Upstream] ACPI: Add Thinkpad T400 & Thinkpad T500 to OSI(Linux) white-list"
  Upstream suggests that this is not the right approach.
* [Config] Set default I/O scheduler to DEADLINE
  CFQ seems to have some load related problems which are often exacerbated by sreadahead.
  - LP: #381300
* SAUCE: ipw2200: Enable LED by default
  - LP: #21367
* ALSA: hda - Add support for new AMD HD audio devices
  - LP: #430564

9. By Andy Whitcroft

[ Amit Kucheria ]

* ARM: IMX51: Fix USB errors
* ARM: IMX51: Copy over the 2.6.28 version of fec.c
  - LP: #418238
* ARM: IMX51: Make fec ethernet driver compile
* [Config] Disable FEC2 for imx51

8. By Andy Whitcroft

[ Alan Tull ]

* ARM: IMX51: ENGR00114681 pcm: set minimum period to 2k
* ARM: IMX51: ENGR00114820-1 Revert SGTL5000: Enable amixer controls
  Jack/Speaker Function
* ARM: IMX51: ENGR00114820-2 sgtl5000: pop fixes
* ARM: IMX51: ENGR00114867 MX51: tristate i2c levelshifter
* ARM: IMX51: ENGR00115688 dvi: disable edid read
* ARM: IMX51: ENGR00115618-1 sgtl5000: power reduction pop fix
* ARM: IMX51: ENGR00115618-2 sgtl5000: power savings
* ARM: IMX51: ENGR00115754 sgtl5000: power mic bias earlier

[ Amit Kucheria ]

* [Config] Run updateconfigs after rebasing to 2.6.31-rc8
* ARM: IMX51: Make sgt5000 driver compile
* [Upstream] Remove X86 dependency for the rt3070 driver
  - LP: #423767
* [Config] Enable rt3070 from staging for imx51
  - LP: #423767
* [Config] Set CONFIG_LSM_MMAP_MIN_ADDR to 0
* [Config] imx51: Enable APM_EMULATION as per imx51_defconfig
* ARM: IMX51: Fix compile of mxc_dataflash.c by replacing bus_id
* ARM: IMX51: Don't let the dataflash driver hitch a ride on CONFIG_MTD
* [Config] imx51: disable MTD_MXC_DATAFLASH
* [Config] Run updateconfigs after rebasing to 2.6.31 final
* [Config] imx51: updateconfigs after applying sdk-1.6 patches
* ARM: IMX51: Remove cpu_is_mx2/cpu_is_mx3 definition from hardware.h
* ARM: IMX51: Paramters to module_param_call should be NULL

[ Ann Thornton ]

* ARM: IMX51: ENGR00113055-1 Add ability to read and user EDID info
* ARM: IMX51: ENGR00113055-2 Added ability to read EDID data and use it
  to set monitor.
* ARM: IMX51: ENGR00114026 MX51 Prevent 2nd initialization of
* ARM: IMX51: ENGR00114023-1 Support for dual monitors.
* ARM: IMX51: ENGR00114023-2 MX51: Add support for dual monitors.
* ARM: IMX51: ENGR00114024 Enable 720p via HDMI

[ Arik Gubeskys ]

* ARM: IMX51: ENGR00114210 IPU IC bypass mode: move display configuration
  to the FB driver

[ b00984 ]

* ARM: IMX51: ENGR00113773 Add apm support for mc13892 battery
* ARM: IMX51: ENGR00114655 mitsubishi lvds xga lcd support for babbage

[ Dinh Nguyen ]

* ARM: IMX51: ENGR00114282 MX51: Disable L2 SRPG
* ARM: IMX51: ENGR00114453 MX51: Add support for keypad on Babbage 2.5

[ Guoqing Jiang ]

* ARM: IMX51: ENGR00113618 Audio: Workaround for sgtl5000 codec suspend
  failure issue on MX25

[ Jason ]

* ARM: IMX51: ENGR00114157-1 Add SPI data flash driver support
* ARM: IMX51: ENGR00114157-2 Add SPI data flash support for MX51
* ARM: IMX51: ENGR00114189 Enlarge the rootfs partition to accommodate
* ARM: IMX51: ENGR00113990 Fix for mtd_oobtest test failure
* ARM: IMX51: ENGR00114882 Reset NFC delay line register
* ARM: IMX51: ENGR00114880 Data abort on NFC memory byte access
* ARM: IMX51: ENGR00115329 Enable NFC symmetric mode on MX51
* ARM: IMX51: ENGR00115330 Fix ECC mode setting for MX51TO3
* ARM: IMX51: ENGR00115336 Fix setting NFC FW for 16bit nand flash
  support on MX51

[ JasonHua ]

* ARM: IMX51: ENGR00113106 MX25 Camera: Some kernel message dumped when
  remove ov2640_camera

[ Katherine Lu ]

* ARM: IMX51: ENGR00114097 MX51 Babbage: Register backlight device only
  display card attached
* ARM: IMX51: ENGR00113546 MX51: set PLL2 as UART parent clk
* ARM: IMX51: ENGR00114139 MX51 Babbage: remove MC13892 backlight device
* ARM: IMX51: ENGR00114166 MX51 Babbage: can not reboot from SPI NOR
* ARM: IMX51: ENGR00114037 MX31: LCD can not resume after entering
* ARM: IMX51: ENGR00114881 MX51: Disable SAHARA by default
* ARM: IMX51: ENGR00114803 eCSPI Hang when acessing from multi modules

[ Lily Zhang ]

* ARM: IMX51: ENGR00113197-1 Fix Write pending issue with hwclock
* ARM: IMX51: ENGR00113197-2 disable RTC clock when it's not active
* ARM: IMX51: ENGR00110228 Fix GPT timer stop issue
* ARM: IMX51: ENGR00113662 enable coin cell charger
* ARM: IMX51: ENGR00114328-1 SRTC: Change wait time for write operations
* ARM: IMX51: ENGR00114328-2 BBG: Keep VRTC and CKIL active for SRTC
* ARM: IMX51: ENGR00114345 Set MC13892 irq as wakeup resource
* ARM: IMX51: ENGR00114738 MX51 BBG: Add OneWire support

[ Lionel.Xu ]

* ARM: IMX51: ENGR00107200 MX25: The SW workaround for left/right channel
  random swap issue
* ARM: IMX51: ENGR00113470 MX37 ALSA ADC: Resolve the issue that arecord
  can't work
* ARM: IMX51: ENGR00115113 SGTL5000: Jack Function/Speaker Function

[ Liu Ying ]

* ARM: IMX51: ENGR00113541 IPUv3:Support IC combing with local alpha
  contained in pixel
* ARM: IMX51: ENGR00113673 IPUv3:Fix RGB to RGB pixel format changing
  with IC PRP_VF
* ARM: IMX51: ENGR00114324-1 Enhance mmap implement of IIM driver
* ARM: IMX51: ENGR00114611 Support RGB565 pixel format for WVGA panel on
* ARM: IMX51: ENGR00114617 Support OV3640 camera on BBG2.5 accessory
* ARM: IMX51: ENGR00114663-1 Add function comments for mmap function of
  IIM driver

[ Nancy Chen ]

* ARM: IMX51: ENGR00114374 USB: Failed to unload USB host module
* ARM: IMX51: ENGR00114685 MX51: Change the GP voltages for 167MHz and
* ARM: IMX51: ENGR00114689 CPUFREQ: Add conservative governor support
* ARM: IMX51: ENGR00114686 DVFS-CORE: Use GPC STRT bit to control DVFS
* ARM: IMX51: ENGR00114686-1 MX51: Enable other CPUFREQ governors
* ARM: IMX51: ENGR00114736 Fix build break by adding mxc_dvfs.h
* ARM: IMX51: ENGR00114871 MX51: Add command line to enable peripheral SW
  Freq scaling
* ARM: IMX51: ENGR00114963 MX51: CPUFREQ is not trigged if DVFS CORE is
* ARM: IMX51: ENGR00115013 MX51: System doesn't enter APM mode if DVFS
  CORE enabled

[ Patrick Turley ]

* ARM: IMX51: ENGR00107929 /proc/cpu/clocks Corrupts memory
* ARM: IMX51: ENGR00103310 Initial imx_nfc NAND Flash MTD driver
* ARM: IMX51: ENGR00115700: mxc_nd2 driver panics the kernel when booting
  on i.MX25

[ Raj Rajasekaran ]

* ARM: IMX51: ENGR00107366 DryIce: DryIce unit test failed with RTC

[ Ranjani Vaidyanathan-RA5478 ]

* ARM: IMX51: ENGR00114937: MX51: Move USBOH3 and USB-PHY to source from
  PLL2 and 24MHz.
* ARM: IMX51: ENGR00115321: MX51: Change STOP mode voltage based on DS0.3
* ARM: IMX51: ENGR00115334: MX51: Donot scale arm_axi_clk in peripheral
  bus scaling.

[ Richard Zhu ]

* ARM: IMX51: ENGR00113376 [MX37] SD can't detected after fast
* ARM: IMX51: ENGR00113607 Refine and unify the definitions of the two
  mmc host
* ARM: IMX51: ENGR00114325-1: SIM: Add MX25 support

[ Rob Herring ]

* ARM: IMX51: ENGR00114598 mx51: add missing fb memory resource setup
* ARM: IMX51: ENGR00114599 mx51: Add gpu2d uio driver
* ARM: IMX51: ENGR00115613 ipuv3: enable DMFC watermark for sync channels

[ Robby Cai ]

* ARM: IMX51: ENGR00114911 make video buffer cacheable to improve video

[ Tim Gardner ]

* [Config] Don't include ABI or version in vmlinuz name in kernel-image
  - LP: #359049

[ Wallace Wang ]

* ARM: IMX51: ENGR00114140 SSI: TX fail if RX is enabled before TX
* ARM: IMX51: ENGR00114625 BABBAGE: Add spdif support
* ARM: IMX51: ENGR00114851 MX51: Fix SSI1 SDMA data transfer failure

[ William Lai ]

* ARM: IMX51: ENGR00114609 MX35 ASRC: Support SPDIF in/out
* ARM: IMX51: ENGR00114644-1 MX51 PWM: Add pwm and backlight devices
* ARM: IMX51: ENGR00114644-2 MX51 PWM: Correction for the PWM

[ Wu Guoxing ]

* ARM: IMX51: ENGR00114622 GPU: add platform device
* ARM: IMX51: ENGR00114692 GPU: use axi_a_clk for both 2d and 3d
* ARM: IMX51: ENGR00114962 : change gpu UIO driver to module

[ Xinyu Chen ]

* ARM: IMX51: ENGR00114989 MX35 SPDIF driver failed to play 48KHz audio

[ Zhou Jingyu ]

* ARM: IMX51: ENGR00114145 disable pmic charger on Babbage
* ARM: IMX51: ENGR00113543 fix bug in mc13892 ADC suspend

[ Ubuntu: 2.6.31-10.34 ]

* [Upstream] ext3: Don't update superblock write time when filesystem is
  - LP: #427622

[ Ubuntu: 2.6.31-10.33 ]

* [Upstream] dvb-usb: fix tuning with Cinergy T2
  - LP: #421258
* [Config] Unconditionally copy files from sub-flavours lists.
  (really, really fix it this time)
  - LP: #423426
* [Config] Set CONFIG_CACHEFILES=m for all flavours
* ext4: Don't update superblock write time when filesystem is read-only
  - LP: #427822

[ Ubuntu: 2.6.31-10.32 ]

* [Config] enable module support for memory stick
  - LP: #159951
* [Config] Unconditionally copy files from sub-flavours lists.
  - LP: #423426

[ Ubuntu: 2.6.31-10.31 ]

* rebase to v2.6.31 final
* [Config] Recommend grub-pc in linux-image
  - LP: #385741
* [Upstream] Pull latest update of lenovo-sl-laptop
* [Upstream] (drop after 2.6.31) acerhdf: fix fan control for AOA150
  - LP: #426691
* [Config] De-macro some package names.
* rebase to 2.6.31 final.

[ Ubuntu: 2.6.31-10.30 ]

  - LP: #417748
* [Config] Populate the config-update template a bit more
* rebase to v2.6.31-rc9
* [Config] update configs following rebase to v2.6.31-rc9
* [Config] update ports configs following rebase to v2.6.31-rc9
* SAUCE: wireless: hostap, fix oops due to early probing interrupt
  - LP: #254837
* [Upstream] ACPI: Add Thinkpad T400 & Thinkpad T500 to OSI(Linux)
  - LP: #281732
* [Upstream] ACPI: Add Thinkpad X200, X200s, X200t to OSI(Linux)
  - LP: #281732
* [Upstream] ACPI: Add Thinkpad X300 & Thinkpad X301 to OSI(Linux)
  - LP: #281732
* [Upstream] ACPI: Add Thinkpad R400 & Thinkpad R500 to OSI(Linux)
  - LP: #281732
* [Upstream] ACPI: Add Thinkpad W500, W700, & W700ds to OSI(Linux)
  - LP: #281732
* SAUCE: AppArmor: Fix profile attachment for regexp based profile names
  - LP: #419308
* SAUCE: AppArmor: Return the correct error codes on profile
  - LP: #408473
* SAUCE: AppArmor: Fix OOPS in profile listing, and display full list
  - LP: #408454
* SAUCE: AppArmor: Fix mapping of pux to new internal permission format
  - LP: #419222
* SAUCE: AppArmor: Fix change_profile failure
  - LP: #401931
* SAUCE: AppArmor: Tell git to ignore generated include files
  - LP: #419505
* [Upstream] acpi: video: Loosen strictness of video bus detection code
  - LP: #333386
* SAUCE: Remove ov511 driver from ubuntu subdirectory
* [Config] Exclude char-modules from non-x86 udeb creation
* SAUCE: Notify the ACPI call chain of AC events
* [Config] CONFIG_SATA_VIA=m
  - LP: #403385
* [Config] Build in all phylib support modules.
* [Config] Don't fail when sub-flavour files are missing
  - LP: #423426
  - LP: #423513
* Rebased against v2.6.31-rc9

[ Ubuntu: 2.6.31-9.29 ]

* [Upstream] agp/intel: support for new chip variant of IGDNG mobile
  - LP: #419993
* [Config] d-i/modules: Add new char-modules file, initialize with
  - LP: #420605
* Rebased against 2.6.31-rc8 plus some inotify regression patches:
  up through git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[ Ubuntu: 2.6.31-8.28 ]

* [Config] Let nic-shared-modules depends on crypto-modules
  - LP: #360966
* [Upstream] (drop after 2.6.31) drm/i915: increase default latency
  - LP: #412492
* [Upstream]: (drop after 2.6.31) dell-laptop: don't change softblock
  status if HW switch is disabled
  - LP: #418721
* [Upstream]: (drop after 2.6.31) compal-laptop: Add support for known
  Compal made Dell laptops
* [Upstream]: (drop after 2.6.31) compal-laptop: Replace sysfs support
  with rfkill support
* [Config] Add acpiphp to virtual sub-flavour
  - LP: #364916
* Drop KSM patch set for now because of instabilities with encrypted swap.
  - LP: #418781

[ Ubuntu: 2.6.31-7.27 ]

* [Config] updateconfigs updateportsconfigs after 2.6.31-rc7 rebase
* SAUCE: (drop after 2.6.31) Added KSM from mmotm-2009-08-20-19-18
  Replaces previous ksm patches from 2.6.31-6.25
* [Config] KSM=y

[ Ubuntu: 2.6.31-6.26 ]

* [Config] enable CONFIG_AUFS_BR_RAMFS
  - LP: #414738
* split out debian directory ready for abstraction
* add printdebian target to find branch target
* abstracted debian -- debian/files is not abstracted
* abstracted debian -- packages must be built in debian/<pkg>
* abstracted debian -- kernel-wedge needs to work in debian/
* abstracted debian -- ensure we install the copyright file
* abstracted-debian -- drop the debian directories from headers
* abstracted-debian -- drop the debian directories from headers part 2
* SAUCE: ubuntu-insert-changes -- follow abstracted debian
* [Upstream] aoe: ensure we initialise the request_queue correctly V2
  - LP: #410198
* [Config] Ports: Disable CONFIG_CPU_FREQ_DEBUG on powerpc-smp
* [Config] Ports: Re-enable windfarm modules on powerpc64-smp
  - LP: #413150
* [Config] Ports: Build all cpu frequency scaling governors into ports
* [Config] Ports: Build ext2 and ext3 modules into ports kernels
* [Config] Ports: CONFIG_PACKET=y for all ports kernels
* [Config] Ports: Enable PS3 network driver
* abstracted debian -- call $(DEBIAN)/rules using make
* [Config] Abstract the debian directory
* SAUCE: Improve error reporting in postinst
  - LP: #358564

7. By Tim Gardner

[ Tim Gardner ]

[Config] Removed debug package rules

6. By Tim Gardner

[ Tim Gardner ]

[Config] Add rsync as a build dependency

5. By Tim Gardner

[ Tim Gardner ]

* [Config] Do not generate a doc package
* [Config] Do not produce a source package
* [Config] Only create one headers package
  - LP: #417264

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.