diff options
author | 2011-06-06 08:08:28 -0700 | |
---|---|---|
committer | 2011-06-06 08:08:38 -0700 | |
commit | 163baa33552bb1c08b6bf109319505570658a8f3 (patch) | |
tree | db130209cf27ec72ecd5a7121a3c91543badc8f3 /drivers/tty/rocket.h | |
parent | 8250_pci: add -ENODEV code for Intel EG20T PCH (diff) | |
parent | Linux 3.0-rc2 (diff) | |
download | linux-dev-163baa33552bb1c08b6bf109319505570658a8f3.tar.xz linux-dev-163baa33552bb1c08b6bf109319505570658a8f3.zip |
Merge 3.0-rc2 into tty-linus
This is needed to catch the tty patch revert in the 3.0-rc2 tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/rocket.h')
0 files changed, 0 insertions, 0 deletions