summaryrefslogtreecommitdiffstats
path: root/include/linux/if_tunnel.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-11 15:46:42 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-11 15:46:42 -0700
commit2bf9d6d0f2dadc2a6c13684719c67dc043b9ce67 (patch)
tree512d855751247641aa68991b11026c1fb48736af /include/linux/if_tunnel.h
parent6572b2064a54f1ed29fcbf6d16dfc5de71dfe495 (diff)
parentd8a5a8d7cc32e4474326e0ecc1b959063490efc9 (diff)
downloadblackbird-op-linux-2bf9d6d0f2dadc2a6c13684719c67dc043b9ce67.tar.gz
blackbird-op-linux-2bf9d6d0f2dadc2a6c13684719c67dc043b9ce67.zip
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] 8250: add locking to console write function [SERIAL] Remove unconditional enable of TX irq for console [SERIAL] 8250: set divisor register correctly for AMD Alchemy SoC uart [SERIAL] AMD Alchemy UART: claim memory range [SERIAL] Clean up serial locking when obtaining a reference to a port
Diffstat (limited to 'include/linux/if_tunnel.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud