diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-24 20:36:31 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-24 20:36:31 +0100 |
commit | f227e08b71b9c273eaa29a57370a3a5b833aa382 (patch) | |
tree | 9f1483776a2bde3bb1a6bd744e69acf19f6f3428 /arch/arm/mach-omap2/opp.c | |
parent | pch_uart: Fix DMA channel miss-setting issue. (diff) | |
parent | Linux 2.6.38-rc6 (diff) | |
download | linux-f227e08b71b9c273eaa29a57370a3a5b833aa382.tar.xz linux-f227e08b71b9c273eaa29a57370a3a5b833aa382.zip |
Merge 2.6.38-rc6 into tty-next
This was to resolve a merge issue with drivers/char/Makefile and
drivers/tty/serial/68328serial.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-omap2/opp.c')
0 files changed, 0 insertions, 0 deletions