]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Oct 2011 19:20:35 +0000 (20:20 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 2 Oct 2011 19:20:35 +0000 (20:20 +0100)
commit6010c4c6c8e60bece2d71173c96400bcd0aae792
tree56ba38b871fe6851b4d98da62e18b70d5f081feb
parent4b8713fd5459619ba8a5a43afcfe7b47a57a8d82
parentb5c49d49b9e175fd56cb4b5cf2c4fd972d15e013
Merge branch 'for-3.1' into for-3.2

Conflicts:
sound/soc/omap/mcpdm.c
sound/soc/omap/mcpdm.h