]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/tty/serial/netx-serial.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 14 Feb 2011 19:16:12 +0000 (11:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Feb 2011 19:16:12 +0000 (11:16 -0800)
commitaf756e9d8873efc8b0565c06734ef12d9b652061
tree5e1f93a9fd46a9939cb5f7d937f173f9ccf41b48
parentac09664248e300342e92b937c9894a8149ddf189
parentde9963f0f2dfad128b26ae7bf6005f5948416a6d
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6