217e2a5d12
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-14 15:58:10 -07:00
2780404133
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-14 15:58:08 -07:00
e675e57f26
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-14 15:58:07 -07:00
2490638a83
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-14 15:57:57 -07:00
35e54ecb43
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-14 15:57:55 -07:00
ae4e1bef0f
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-10-14 15:57:54 -07:00
ee650bf43e
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-10-14 15:57:44 -07:00
85e24818d4
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-14 15:57:42 -07:00
01744f9ee5
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-10-14 15:57:36 -07:00
db77dd0e60
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-14 15:57:34 -07:00
5a3aae2aa8
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-10-14 15:57:29 -07:00
293fe80262
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-10-14 15:57:27 -07:00
0524e50889
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-10-14 15:57:21 -07:00
b368c0b19e
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-10-14 15:57:19 -07:00
aa587c8437
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-14 15:57:13 -07:00
5c86e9cad6
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-10-14 15:57:11 -07:00
085ed9fe82
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-10-14 15:57:10 -07:00
cb678c0b31
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-10-14 15:57:09 -07:00
9ea3f53d0c
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-10-14 15:57:09 -07:00
a8adb61c00
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-10-14 15:57:08 -07:00
09a8c99097
Additional build system update for libefi library.
...
This include updating all the Makefile.am to have the correct
include paths and libraries. In addition, the zlib m4 macro was
updated to more correctly integrate with the Makefiles. And I
added two new macros libblkid and libuuid which will be needed by
subsequent commits for blkid and uuid support respectively. The
blkid support is optional, the uuid support is mandatory for libefi.
2009-10-14 15:47:41 -07:00
39d85a8b94
Remove pragmas from new libefi files.
2009-10-14 15:44:22 -07:00
96b06c2c31
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:44 -07:00
a215e35e77
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-10-09 16:44:42 -07:00
6dda0ef530
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:36 -07:00
6b40b82861
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-10-09 16:44:35 -07:00
880e04ea66
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:29 -07:00
2fd5a539e9
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-09 16:44:27 -07:00
17b2ca2cda
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:21 -07:00
2f001ab9ea
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-10-09 16:44:19 -07:00
1df5c99bd4
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:11 -07:00
9fb47da60f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-10-09 16:44:10 -07:00
82177ca67b
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-09 16:44:03 -07:00
89eadc4abd
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-10-09 16:44:01 -07:00
267d3a18cd
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:55 -07:00
81ec3f8951
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-09 16:43:53 -07:00
c3cdcce985
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:47 -07:00
982dc2a6f0
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-09 16:43:45 -07:00
fc9f0b6354
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:39 -07:00
10cb050e20
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-10-09 16:43:37 -07:00
c5d942b1eb
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:31 -07:00
7d9b89f749
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-09 16:43:29 -07:00
ac96b6e281
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:23 -07:00
a1af33894c
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-10-09 16:43:21 -07:00
d5f3570012
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:15 -07:00
bbe79ef2eb
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-10-09 16:43:13 -07:00
6edf51dcd1
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-09 16:43:07 -07:00
f9291ee05a
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-09 16:43:06 -07:00
fe812499af
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-09 16:43:05 -07:00
724b61b653
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-09 16:42:54 -07:00
Brian Behlendorf