diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-12 20:42:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-12 20:42:02 -0700 |
| commit | c44efbaa0ef3cf53fbf6bb57c33d4f199b15f2da (patch) | |
| tree | cb3822fb10688a13bb23d769ef54b3e398579f46 /fs/eventpoll.c | |
| parent | ce8a84ef1e4b30bcee78aa99bc1032db90a6c1c4 (diff) | |
| parent | 696314cf53b7b2d1f91af6da259533eb9611e7bf (diff) | |
| download | blackbird-op-linux-c44efbaa0ef3cf53fbf6bb57c33d4f199b15f2da.tar.gz blackbird-op-linux-c44efbaa0ef3cf53fbf6bb57c33d4f199b15f2da.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (32 commits)
ARM: mmp: Change the way we use timer 0 as clockevent timer.
ARM: mmp: Switch to using timer 1 as clocksource timer.
ARM: mmp: Also start timer 1 on boot.
ARM: pxa168/gplugd: free correct GPIO
ARM: pxa168/gplugd: get rid of mfp-gplugd.h
ARM: pxa: fix logic error in PJ4 iWMMXt handling
mach-sa1100: fix PCI build problem
omap: timer: Set dmtimer used as clocksource in autoreload mode
OMAP3: am3517crane: remove NULL board_mux from board file
arm: mach-omap2: mux: use kstrdup()
arch:arm:plat-omap:iovmm: remove unused variable 'va'
Update Nook Color machine 3284 to common Encore name
am3505/3517: Various platform defines for UART4
OMAP: hwmod: fix build break on non-OMAP4 multi-OMAP2 builds
OMAP: Fix linking error in twl-common.c for OMAP2/3/4 only builds
iMX: Fix build for iMX53
ARM: mx5: board-cpuimx51.c fixup irq_to_gpio() usage
OMAP2+: PM: SmartReflex: use put_sync_suspend for IRQ-safe disabling
OMAP3: beagle: don't touch omap_device internals
OMAP1: enable GENERIC_IRQ_CHIP
...
Diffstat (limited to 'fs/eventpoll.c')
0 files changed, 0 insertions, 0 deletions
