diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-14 17:55:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-14 17:55:57 -0700 |
commit | 5b799dde3159284fdee8d60f535e2753a86dbb3f (patch) | |
tree | 636a679344e014cfda8e9f98be026057c2baba26 /net/netfilter/nf_conntrack_proto_tcp.c | |
parent | 1547cb80db5587c465be609b9a15bfb2dfd73099 (diff) | |
parent | 5f71a3ef3753ac2068009637eee619e163f44b30 (diff) | |
download | op-kernel-dev-5b799dde3159284fdee8d60f535e2753a86dbb3f.zip op-kernel-dev-5b799dde3159284fdee8d60f535e2753a86dbb3f.tar.gz |
Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux
Pull i2c embedded fixes from Wolfram Sang:
"The last bunch of (typical) i2c-embedded driver fixes for 3.6.
Also update the MAINTAINERS file to point to my tree since people keep
asking where to find their patches."
* 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
i2c: algo: pca: Fix mode selection for PCA9665
MAINTAINERS: fix tree for current i2c-embedded development
i2c: mxs: correctly setup speed for non devicetree
i2c: pnx: Fix read transactions of >= 2 bytes
i2c: pnx: Fix bit definitions
Diffstat (limited to 'net/netfilter/nf_conntrack_proto_tcp.c')
0 files changed, 0 insertions, 0 deletions