Commit Graph

6 Commits

Author SHA1 Message Date
Brian Behlendorf 7e43e16395 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-16 15:34:50 -08:00
Brian Behlendorf 35f607040f Wrap additional new efi code in HAVE_LIBEFI macros 2008-12-16 15:33:00 -08:00
Brian Behlendorf 1b0348e335 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-11 11:35:29 -08:00
Brian Behlendorf aca9d98817 Fix conflict 2008-12-11 11:34:16 -08:00
Brian Behlendorf 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00