Brian Behlendorf
|
cb9c044bf6
|
Add SPL prefix to META_* #defines
|
2008-11-26 13:11:33 -08:00 |
|
Brian Behlendorf
|
09dbc3a094
|
Merge commit 'refs/top-bases/top' into top
|
2008-11-26 12:58:34 -08:00 |
|
Brian Behlendorf
|
db9a88686f
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-11-26 12:58:33 -08:00 |
|
Brian Behlendorf
|
41f73d8aba
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-11-26 12:58:32 -08:00 |
|
Brian Behlendorf
|
2d1e6fcded
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:58:31 -08:00 |
|
Brian Behlendorf
|
54deb34e63
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-11-26 12:58:30 -08:00 |
|
Brian Behlendorf
|
57c3d662ff
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:58:26 -08:00 |
|
Brian Behlendorf
|
c8bfb1de95
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-11-26 12:58:25 -08:00 |
|
Brian Behlendorf
|
33a417ce18
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:58:21 -08:00 |
|
Brian Behlendorf
|
67e017e363
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-11-26 12:58:19 -08:00 |
|
Brian Behlendorf
|
2dc222a05d
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:58:15 -08:00 |
|
Brian Behlendorf
|
eda23592fe
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-11-26 12:58:14 -08:00 |
|
Brian Behlendorf
|
3bb2bb6121
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:58:10 -08:00 |
|
Brian Behlendorf
|
9e6e7c13fc
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-11-26 12:58:09 -08:00 |
|
Brian Behlendorf
|
539c0d1f03
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:58:05 -08:00 |
|
Brian Behlendorf
|
3b989bd206
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-11-26 12:58:03 -08:00 |
|
Brian Behlendorf
|
351211bb03
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:59 -08:00 |
|
Brian Behlendorf
|
5282cafc40
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-11-26 12:57:58 -08:00 |
|
Brian Behlendorf
|
2ee482f32f
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:54 -08:00 |
|
Brian Behlendorf
|
92e4b17943
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-11-26 12:57:52 -08:00 |
|
Brian Behlendorf
|
d5329a343f
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:48 -08:00 |
|
Brian Behlendorf
|
07ca58233f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-11-26 12:57:47 -08:00 |
|
Brian Behlendorf
|
9deb0d257e
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:44 -08:00 |
|
Brian Behlendorf
|
ed89132412
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-11-26 12:57:42 -08:00 |
|
Brian Behlendorf
|
1cac8dc6cf
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:38 -08:00 |
|
Brian Behlendorf
|
f46f735de9
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-11-26 12:57:37 -08:00 |
|
Brian Behlendorf
|
ff2a1023a1
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:33 -08:00 |
|
Brian Behlendorf
|
2af14cbe85
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-11-26 12:57:32 -08:00 |
|
Brian Behlendorf
|
7af893be7b
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:28 -08:00 |
|
Brian Behlendorf
|
b3d72c6309
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-11-26 12:57:27 -08:00 |
|
Brian Behlendorf
|
5d65f0f53a
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:23 -08:00 |
|
Brian Behlendorf
|
49d0f1ad4e
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-11-26 12:57:22 -08:00 |
|
Brian Behlendorf
|
8c56f3a24a
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:17 -08:00 |
|
Brian Behlendorf
|
1acf781b87
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-11-26 12:57:16 -08:00 |
|
Brian Behlendorf
|
0b8f2fbb52
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:13 -08:00 |
|
Brian Behlendorf
|
4c499ace53
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-11-26 12:57:11 -08:00 |
|
Brian Behlendorf
|
c16b34a0c4
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-11-26 12:57:11 -08:00 |
|
Brian Behlendorf
|
cfbc328fa3
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-11-26 12:57:09 -08:00 |
|
Brian Behlendorf
|
1267d24bc2
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-11-26 12:57:00 -08:00 |
|
Brian Behlendorf
|
fdfef766e8
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-11-26 12:56:59 -08:00 |
|
Brian Behlendorf
|
ae47292dc4
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-11-26 12:56:58 -08:00 |
|
Brian Behlendorf
|
966c5fbeb6
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-11-26 12:56:57 -08:00 |
|
Brian Behlendorf
|
d7a60696d1
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-11-26 12:56:56 -08:00 |
|
Brian Behlendorf
|
9ccfb5c0f2
|
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
|
2008-11-26 12:56:55 -08:00 |
|
Brian Behlendorf
|
6299b56dc3
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-11-26 12:56:54 -08:00 |
|
Brian Behlendorf
|
31547afd6b
|
Merge branch 'gcc-no-pragmas' into refs/top-bases/gcc-branch
|
2008-11-26 12:56:53 -08:00 |
|
Brian Behlendorf
|
0c095e2c22
|
Merge commit 'refs/top-bases/gcc-no-pragmas' into gcc-no-pragmas
|
2008-11-26 12:56:52 -08:00 |
|
Brian Behlendorf
|
54a56125c1
|
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
|
2008-11-26 12:56:49 -08:00 |
|
Brian Behlendorf
|
5b9ea94733
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-11-26 12:56:48 -08:00 |
|
Brian Behlendorf
|
014a4b6a82
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2008-11-26 12:56:46 -08:00 |
|