aboutsummaryrefslogtreecommitdiff
path: root/include/linux/serial167.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-23 16:21:16 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-23 16:21:16 -0700
commit039a6f6a39d2aa30ee53afdb213ea6dd4482928b (patch)
tree7ea0979b9a227039be3b9ced35b9a429a6974cab /include/linux/serial167.h
parent18f27383d9bdcb985cc39599e99917bdad101a60 (diff)
ucc_geth: Fix merge error.
I left a merge failure unresolved, noticed by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/serial167.h')
0 files changed, 0 insertions, 0 deletions