diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-29 14:36:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-29 14:36:07 -0800 |
| commit | a9735c81a43054a7e8cb8771c8e04c01fcacde10 (patch) | |
| tree | 53d0fa7f31240a95eb7a77cd555d87ce9c20472e /include/linux/pci_ids.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
| parent | OMAP2+: PM/serial: hold console semaphore while OMAP UARTs are disabled (diff) | |
| download | linux-dev-a9735c81a43054a7e8cb8771c8e04c01fcacde10.tar.xz linux-dev-a9735c81a43054a7e8cb8771c8e04c01fcacde10.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:
OMAP2+: PM/serial: hold console semaphore while OMAP UARTs are disabled
OMAP: UART: don't resume UARTs that are not enabled.
Diffstat (limited to 'include/linux/pci_ids.h')
0 files changed, 0 insertions, 0 deletions