Brian Behlendorf
|
c311c0eb9a
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-09 15:55:48 -08:00 |
|
Brian Behlendorf
|
40f1eae131
|
Add libspl includes to libumem
|
2008-12-09 15:52:41 -08:00 |
|
Brian Behlendorf
|
7ef476ec56
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:57:41 -08:00 |
|
Brian Behlendorf
|
9609895119
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 14:57:40 -08:00 |
|
Brian Behlendorf
|
dc12dfcc4f
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:57:36 -08:00 |
|
Brian Behlendorf
|
92a27cc45a
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-09 14:57:35 -08:00 |
|
Brian Behlendorf
|
22234ee789
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:57:32 -08:00 |
|
Brian Behlendorf
|
ed2f22143d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-09 14:57:31 -08:00 |
|
Brian Behlendorf
|
5b350f73dc
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:57:27 -08:00 |
|
Brian Behlendorf
|
6a71d3347e
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-09 14:57:26 -08:00 |
|
Brian Behlendorf
|
4c59c10f7b
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:57:23 -08:00 |
|
Brian Behlendorf
|
cd6973a986
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-09 14:57:21 -08:00 |
|
Brian Behlendorf
|
8cea39960c
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:57:18 -08:00 |
|
Brian Behlendorf
|
7aa8156f49
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-09 14:57:17 -08:00 |
|
Brian Behlendorf
|
89fc30c443
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:57:14 -08:00 |
|
Brian Behlendorf
|
abf65ffcd6
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-09 14:57:13 -08:00 |
|
Brian Behlendorf
|
8eb8888069
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:57:09 -08:00 |
|
Brian Behlendorf
|
d89b701cd9
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-09 14:57:08 -08:00 |
|
Brian Behlendorf
|
0e9fa64506
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:57:05 -08:00 |
|
Brian Behlendorf
|
d51115a7ee
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-09 14:57:03 -08:00 |
|
Brian Behlendorf
|
49ddbf1331
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:57:00 -08:00 |
|
Brian Behlendorf
|
4b9c728102
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-09 14:56:59 -08:00 |
|
Brian Behlendorf
|
52ee8c721b
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:56 -08:00 |
|
Brian Behlendorf
|
48aa829ea0
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-09 14:56:55 -08:00 |
|
Brian Behlendorf
|
44f4f623ef
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-09 14:56:54 -08:00 |
|
Brian Behlendorf
|
23ebc031ef
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:49 -08:00 |
|
Brian Behlendorf
|
0998fa1c75
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-09 14:56:48 -08:00 |
|
Brian Behlendorf
|
13835610d7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-09 14:56:47 -08:00 |
|
Brian Behlendorf
|
e3504a172e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:41 -08:00 |
|
Brian Behlendorf
|
c063790f4c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-09 14:56:40 -08:00 |
|
Brian Behlendorf
|
bb689e3ea0
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:37 -08:00 |
|
Brian Behlendorf
|
676beb0739
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-09 14:56:35 -08:00 |
|
Brian Behlendorf
|
4c47876071
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:32 -08:00 |
|
Brian Behlendorf
|
33cae2681d
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-09 14:56:31 -08:00 |
|
Brian Behlendorf
|
eb8aee8a14
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:28 -08:00 |
|
Brian Behlendorf
|
e7357ba0d1
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-09 14:56:26 -08:00 |
|
Brian Behlendorf
|
e02301a877
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:23 -08:00 |
|
Brian Behlendorf
|
de9aab23de
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-09 14:56:22 -08:00 |
|
Brian Behlendorf
|
bbc92f20e2
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:18 -08:00 |
|
Brian Behlendorf
|
3b1550ab3d
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-09 14:56:17 -08:00 |
|
Brian Behlendorf
|
28d944d0ec
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:56:14 -08:00 |
|
Brian Behlendorf
|
38ab72c606
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-09 14:56:12 -08:00 |
|
Brian Behlendorf
|
6c745cd2c8
|
Update libumem Makefile to reflect new realities
|
2008-12-09 14:54:45 -08:00 |
|
Brian Behlendorf
|
a5eeed6da5
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:34 -08:00 |
|
Brian Behlendorf
|
f826e7c0dc
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-09 14:42:32 -08:00 |
|
Brian Behlendorf
|
54dc8286c8
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:29 -08:00 |
|
Brian Behlendorf
|
7a212b6b5e
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-09 14:42:28 -08:00 |
|
Brian Behlendorf
|
a6309140a3
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:25 -08:00 |
|
Brian Behlendorf
|
364c22b862
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-09 14:42:24 -08:00 |
|
Brian Behlendorf
|
395281141e
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-09 14:42:20 -08:00 |