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)
commitf631a78445e94b8a9ae23980d00a5cb2d9c3d0c7
tree0c878afd0267ee917fe289fb4b4a5cef3b95b89f
parent13ffc32eaf0b75a19bd8c3a8702faedde28853fe
parentc5b61d59a685b1227b8a994b52a9b0bd68dc8da8
Merge git://git./linux/kernel/git/kkeil/ISDN-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
  Fix namespace issue with Hisax