| commit | 06867fbb8abc936192195e5dcc4b63e12cc78f72 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 30 Dec 2011 21:45:34 +0000 (30 13:45 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 30 Dec 2011 21:45:34 +0000 (30 13:45 -0800) | ||
| tree | 8f9f6cd2006c2bd3d4d6b4047f84c89e60673605 | treesnapshot (tar.gz zip) |
| parent | 604a16b74c8ca2fd29861723a62ad57f0c692333 | commitdiff |
| parent | abb959f8a3f125a6e6641abbd020111516dfc8f6 | commitdiff |
Merge branch 'fixes' of ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
ARM: 7237/1: PL330: Fix driver freeze
ARM: 7197/1: errata: Remove SMP dependency for erratum 751472
ARM: 7196/1: errata: Remove SMP dependency for erratum 720789
ARM: 7220/1: mmc: mmci: Fixup error handling for dma
ARM: 7214/1: mmc: mmci: Fixup handling of MCI_STARTBITERR
* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
ARM: 7237/1: PL330: Fix driver freeze
ARM: 7197/1: errata: Remove SMP dependency for erratum 751472
ARM: 7196/1: errata: Remove SMP dependency for erratum 720789
ARM: 7220/1: mmc: mmci: Fixup error handling for dma
ARM: 7214/1: mmc: mmci: Fixup handling of MCI_STARTBITERR