summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/geode.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-20 12:34:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-20 12:34:43 -0700
commit55017923f699471f68c1469d5f3ff141dd416ab4 (patch)
treed0a45ea1da874baf556218a0b33ce9141760bb30 /include/asm-x86/geode.h
parentb4eea67a129423fe423c5d8d26a0aaa9d68ed600 (diff)
parentf30ac0ce34f32bb998ac87e37b251374de03e603 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin Serial Driver: Use timer to poll CTS PIN instead of workqueue. Blackfin arch: fix typo error in bf548 serial header file
Diffstat (limited to 'include/asm-x86/geode.h')
0 files changed, 0 insertions, 0 deletions