diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-26 23:04:29 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-26 23:04:29 (GMT) |
commit | fc915c8b930c3114f2a838f7e2cd8789ad6fedc3 (patch) | |
tree | 795197f8ec2bc5ba42ee975ecd4d5a16c64e063c /drivers/md/dm-ioctl.c | |
parent | fe89def79c48e2149abdd1e816523e69a9067191 (diff) | |
parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
download | linux-fsl-qoriq-fc915c8b930c3114f2a838f7e2cd8789ad6fedc3.tar.xz |
Merge 3.5-rc4 into tty-next
This is to pick up the serial port and tty changes in Linus's tree to allow
everyone to sync up.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md/dm-ioctl.c')
0 files changed, 0 insertions, 0 deletions