Brian Behlendorf
|
9992095df0
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:38:20 -08:00 |
|
Brian Behlendorf
|
c76494c348
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 16:38:17 -08:00 |
|
Brian Behlendorf
|
c378425b85
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:38:05 -08:00 |
|
Brian Behlendorf
|
e9d61c8c6f
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-16 16:38:02 -08:00 |
|
Brian Behlendorf
|
d1db406041
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:37:51 -08:00 |
|
Brian Behlendorf
|
6078c0a99e
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-16 16:37:47 -08:00 |
|
Brian Behlendorf
|
ce53fe7dd8
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:37:37 -08:00 |
|
Brian Behlendorf
|
9ea59abcba
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-16 16:37:33 -08:00 |
|
Brian Behlendorf
|
b4914b7b92
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:37:23 -08:00 |
|
Brian Behlendorf
|
472384c159
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-16 16:37:19 -08:00 |
|
Brian Behlendorf
|
de6e922042
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:37:09 -08:00 |
|
Brian Behlendorf
|
daa6dfed96
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 16:37:05 -08:00 |
|
Brian Behlendorf
|
9af5ca534b
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:36:54 -08:00 |
|
Brian Behlendorf
|
4ece62233d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 16:36:52 -08:00 |
|
Brian Behlendorf
|
65dfc8d875
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:36:41 -08:00 |
|
Brian Behlendorf
|
8f160abede
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 16:36:39 -08:00 |
|
Brian Behlendorf
|
002c936683
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:36:28 -08:00 |
|
Brian Behlendorf
|
c7b7762418
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-16 16:36:24 -08:00 |
|
Brian Behlendorf
|
1fd8b88c45
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-16 16:36:22 -08:00 |
|
Brian Behlendorf
|
0a200c2921
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:36:03 -08:00 |
|
Brian Behlendorf
|
474fe8adf0
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-16 16:36:00 -08:00 |
|
Brian Behlendorf
|
8ffad5b6c0
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 16:35:57 -08:00 |
|
Brian Behlendorf
|
58fbb971fb
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:35:38 -08:00 |
|
Brian Behlendorf
|
fb69b356c1
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-16 16:35:35 -08:00 |
|
Brian Behlendorf
|
00bb3e1b65
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:35:25 -08:00 |
|
Brian Behlendorf
|
819f033e1b
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-16 16:35:22 -08:00 |
|
Brian Behlendorf
|
ccdf2978c7
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:35:12 -08:00 |
|
Brian Behlendorf
|
158d07270f
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 16:35:09 -08:00 |
|
Brian Behlendorf
|
67a27676f0
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:34:59 -08:00 |
|
Brian Behlendorf
|
4bf744b498
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-16 16:34:55 -08:00 |
|
Brian Behlendorf
|
b69f7b05a8
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:34:45 -08:00 |
|
Brian Behlendorf
|
697b1672f1
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-16 16:34:42 -08:00 |
|
Brian Behlendorf
|
fc4074b8f7
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:34:30 -08:00 |
|
Brian Behlendorf
|
087a95625d
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-16 16:34:28 -08:00 |
|
Brian Behlendorf
|
715ac6ca88
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:34:16 -08:00 |
|
Brian Behlendorf
|
eb480e4c06
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-16 16:34:12 -08:00 |
|
Brian Behlendorf
|
7453ec0f2c
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 16:34:09 -08:00 |
|
Brian Behlendorf
|
8bed8da925
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 16:34:07 -08:00 |
|
Brian Behlendorf
|
1be9b2649d
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-16 16:34:06 -08:00 |
|
Brian Behlendorf
|
2d7f255945
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 16:34:04 -08:00 |
|
Brian Behlendorf
|
ebab24f633
|
Resolve shadow conflict
|
2008-12-16 16:26:50 -08:00 |
|
Brian Behlendorf
|
95421f5f0f
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:22:44 -08:00 |
|
Brian Behlendorf
|
2d271e7a94
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 16:22:42 -08:00 |
|
Brian Behlendorf
|
4211e6bf24
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:22:35 -08:00 |
|
Brian Behlendorf
|
3d34904fbb
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 16:22:34 -08:00 |
|
Brian Behlendorf
|
087d05a322
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:22:26 -08:00 |
|
Brian Behlendorf
|
b7c8d459d8
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-16 16:22:24 -08:00 |
|
Brian Behlendorf
|
5c033d3c52
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:22:18 -08:00 |
|
Brian Behlendorf
|
750332e323
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 16:22:15 -08:00 |
|
Brian Behlendorf
|
e5f5490c4d
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:22:09 -08:00 |