diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-19 11:05:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-19 11:05:05 -0700 |
| commit | f1c9c9797a7c519a70b8e4607f41d97ec59fc8f0 (patch) | |
| tree | 42b0cbfeb946a76844d20c7aae39037f5e1c7ba3 /net/sctp/output.c | |
| parent | 112d421df2fddc0278584b084f4fcfedd144c5f4 (diff) | |
| parent | 4d89ecaae9c145e60b920acb1120f1de3d6eac6e (diff) | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: Add IORESOURCE_IRQ_HIGHLEVEL flag to dm9000 on mach-real6410
ARM: S3C64XX: Fix coding style errors on mach-real6410
ARM: S3C64XX: Prototype SPI devices
ARM: S3C64XX: Fix dev-spi build
ARM: SAMSUNG: Fix on s5p_gpio_[get,set]_drvstr
ARM: SAMSUNG: Fix on drive strength value
ARM: S5PV210: Add FIMC clocks
ARM: S5PV210: Reduce the iodesc length of systimer
ARM: S5PV210: Update I2C-1 Clock Register Property.
ARM: S5P: Decrease IO Registers memory region size on FIMC
ARM: S5P: Fix DMA coherent mask for FIMC
Diffstat (limited to 'net/sctp/output.c')
0 files changed, 0 insertions, 0 deletions