git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62d0cfc cb6efb3)
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
authorKyle McMartin <kyle@parisc-linux.org>
Sat, 17 Feb 2007 05:18:23 +0000 (00:18 -0500)
committerKyle McMartin <kyle@parisc-linux.org>
Sat, 17 Feb 2007 05:18:23 +0000 (00:18 -0500)
Conflicts:

arch/parisc/hpux/sys_hpux.c
arch/parisc/mm/ioremap.c


Trivial merge
Pandora Kernel Repository