summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-26 23:04:29 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-26 23:04:29 (GMT)
commitfc915c8b930c3114f2a838f7e2cd8789ad6fedc3 (patch)
tree795197f8ec2bc5ba42ee975ecd4d5a16c64e063c /drivers/i2c
parentfe89def79c48e2149abdd1e816523e69a9067191 (diff)
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff)
downloadlinux-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/i2c')
0 files changed, 0 insertions, 0 deletions