Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 16:58:59 +0000 (09:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jul 2008 16:58:59 +0000 (09:58 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
  Fix namespace issue with Hisax


Trivial merge