diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 08:16:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-29 08:16:42 -0700 |
| commit | 0b3dc0e9c8ed4f09605fa844081503bf752388b0 (patch) | |
| tree | b6863e3ee9659392f12df909296f882c6b4129c5 /net/ipv4/tcp_timer.c | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 (diff) | |
| parent | omap4: Fix UART4 platform data on omap4 (diff) | |
| download | linux-dev-0b3dc0e9c8ed4f09605fa844081503bf752388b0.tar.xz linux-dev-0b3dc0e9c8ed4f09605fa844081503bf752388b0.zip | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
omap4: Fix UART4 platform data on omap4
omap4: Allow omap_serial_early_init() for OMAP4430 board
omap3: PM: enable UART3 module wakeups
omap2: Fix console serial port number for n8x0
omap2: Fix detection of n8x0
omap1: Fix DSP public peripherals support for ams-delta
omap1: Fix redundant UARTs pin muxing that can break other hardware support
omap: iommu: fix wrong condition check for SUPERSECTION
omap: SDMA: Fix omap_stop_dma() API for channel linking
omap: Fix omap-keypad by restoring old keypad.h without breaking omap2 boards that use matrix_keypad
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions