diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-13 19:10:50 +0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-13 19:10:50 +0800 |
| commit | 6a2a2b85db0edf92ace1198a0a35b99ba201388c (patch) | |
| tree | 9290bf851fa0d183a658fae7c4d11702a0cb82e6 /fs/stat.c | |
| parent | Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| parent | Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes (diff) | |
| download | linux-dev-6a2a2b85db0edf92ace1198a0a35b99ba201388c.tar.xz linux-dev-6a2a2b85db0edf92ace1198a0a35b99ba201388c.zip | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc bug fixes from Olof Johansson:
- A set of OMAP fixes, about half of them PM/clock related, the rest
scattered over the platform code but all small and targeted to real
bugs.
- Two small i.MX fixes for SSI device clock setup.
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: clk-imx35: Fix SSI clock registration
ARM: clk-imx25: Fix SSI clock registration
ARM: OMAP4: Fix array size for irq_target_cpu
ARM: OMAP4: hwmod data: temporarily comment out data for the sl2if IP block
ARM: OMAP: hwmod code: Disable module when hwmod enable fails
ARM: OMAP3: hwmod data: fix iva2 reset info
ARM: OMAP3xxx: clockdomain: fix software supervised wakeup/sleep
ARM: OMAP2+: am33xx: Fix the timer fck clock naming convention
ARM: OMAP: Config fix for omap3-touchbook board
ARM: OMAP: sram: skip the first 16K on OMAP3 HS
ARM: OMAP: sram: fix OMAP4 errata handling
ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER
Diffstat (limited to 'fs/stat.c')
0 files changed, 0 insertions, 0 deletions