tree 0c878afd0267ee917fe289fb4b4a5cef3b95b89f
parent 13ffc32eaf0b75a19bd8c3a8702faedde28853fe
parent c5b61d59a685b1227b8a994b52a9b0bd68dc8da8
author Linus Torvalds <torvalds@linux-foundation.org> 1217177939 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217177939 -0700

Merge git://git.kernel.org/pub/scm/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