diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-08 17:32:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-08 17:32:42 -0800 |
| commit | 9f8050c4f99789d03ca96d4e625bd6637241828f (patch) | |
| tree | 1da2ab64926a1661ab97407ea5ca5e01cc2e977a /drivers/uio | |
| parent | 9a0cee711448335ec43eae83272495e9334c0098 (diff) | |
| parent | c66fcfa938d84d4661c77e9fe85312dece0133e8 (diff) | |
Merge tag 'fixes-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull last minute fixes from Olof Johansson:
"One samsung build fix due to a mis-applied patch, and a small set of
OMAP fixes. This should be the last from arm-soc for 3.3, hopefully."
* tag 'fixes-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: S3C2440: Fixed build error for s3c244x
ARM: OMAP2+: Fix module build errors with CONFIG_OMAP4_ERRATA_I688
ARM: OMAP: id: Add missing break statement in omap3xxx_check_revision
ARM: OMAP2+: Remove apply_uV constraints for fixed regulator
ARM: OMAP: irqs: Fix NR_IRQS value to handle PRCM interrupts
Diffstat (limited to 'drivers/uio')
0 files changed, 0 insertions, 0 deletions