| commit | 55017923f699471f68c1469d5f3ff141dd416ab4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 20 12:34:43 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 20 12:34:43 2008 -0700 |
| tree | d0a45ea1da874baf556218a0b33ce9141760bb30 | |
| parent | b4eea67a129423fe423c5d8d26a0aaa9d68ed600 [diff] | |
| parent | f30ac0ce34f32bb998ac87e37b251374de03e603 [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