Brian Behlendorf
|
6966fd88d2
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:53:37 -08:00 |
|
Brian Behlendorf
|
edd8ad8573
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-05 14:53:36 -08:00 |
|
Brian Behlendorf
|
854a48a354
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:53:33 -08:00 |
|
Brian Behlendorf
|
0943ebe71f
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-05 14:53:32 -08:00 |
|
Brian Behlendorf
|
4e69a8065a
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:53:29 -08:00 |
|
Brian Behlendorf
|
b9122bd134
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-05 14:53:28 -08:00 |
|
Brian Behlendorf
|
104a367047
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-05 14:53:25 -08:00 |
|
Brian Behlendorf
|
9c491264d1
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:53:25 -08:00 |
|
Brian Behlendorf
|
b78abbe7ca
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-05 14:53:21 -08:00 |
|
Brian Behlendorf
|
edf7e9c52b
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:53:21 -08:00 |
|
Brian Behlendorf
|
a9b1a91897
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-05 14:53:17 -08:00 |
|
Brian Behlendorf
|
e021630aac
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:53:17 -08:00 |
|
Brian Behlendorf
|
f7af5c6945
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:53:14 -08:00 |
|
Brian Behlendorf
|
3538d26852
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-05 14:53:13 -08:00 |
|
Brian Behlendorf
|
a4603f629a
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:53:10 -08:00 |
|
Brian Behlendorf
|
bac11fa812
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-05 14:53:09 -08:00 |
|
Brian Behlendorf
|
ed6643e847
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-05 14:53:09 -08:00 |
|
Brian Behlendorf
|
354a960dcc
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:53:04 -08:00 |
|
Brian Behlendorf
|
b318aca142
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-05 14:53:03 -08:00 |
|
Brian Behlendorf
|
f5f7424f6e
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-05 14:53:02 -08:00 |
|
Brian Behlendorf
|
3ba191f6dc
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:52:57 -08:00 |
|
Brian Behlendorf
|
59b699b657
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-05 14:52:56 -08:00 |
|
Brian Behlendorf
|
02e58e9848
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-05 14:52:53 -08:00 |
|
Brian Behlendorf
|
3894b1d0d3
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:52:53 -08:00 |
|
Brian Behlendorf
|
c074a633cd
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:52:50 -08:00 |
|
Brian Behlendorf
|
9611e45d21
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-05 14:52:49 -08:00 |
|
Brian Behlendorf
|
461c400101
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:52:46 -08:00 |
|
Brian Behlendorf
|
83b0367af0
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-05 14:52:45 -08:00 |
|
Brian Behlendorf
|
87ba6704fb
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:52:42 -08:00 |
|
Brian Behlendorf
|
1cc2f0b068
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-05 14:52:41 -08:00 |
|
Brian Behlendorf
|
8f1396b8fd
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-05 14:52:38 -08:00 |
|
Brian Behlendorf
|
fd9a6bc51e
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:52:38 -08:00 |
|
Brian Behlendorf
|
9b699e5a74
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:52:35 -08:00 |
|
Brian Behlendorf
|
bc2f2ee941
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-05 14:52:34 -08:00 |
|
Brian Behlendorf
|
642c2c55fc
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-05 14:52:33 -08:00 |
|
Brian Behlendorf
|
47197dc542
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-05 14:52:33 -08:00 |
|
Brian Behlendorf
|
9af0176ad7
|
Add zu.c file for build system
|
2008-12-05 14:50:51 -08:00 |
|
Brian Behlendorf
|
7e6b444c98
|
Refresh gcc-branch
|
2008-12-05 14:31:46 -08:00 |
|
Brian Behlendorf
|
2c8d04a0f4
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-05 14:29:29 -08:00 |
|
Brian Behlendorf
|
52e58a6f41
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-05 14:29:29 -08:00 |
|
Brian Behlendorf
|
0baf544194
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-05 14:29:28 -08:00 |
|
Brian Behlendorf
|
5651a72119
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:29:28 -08:00 |
|
Brian Behlendorf
|
0efb60d0ad
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:29:25 -08:00 |
|
Brian Behlendorf
|
ee9fcc453b
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-05 14:29:24 -08:00 |
|
Brian Behlendorf
|
1d2eafc78d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-05 14:29:24 -08:00 |
|
Brian Behlendorf
|
fd716b98cc
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-05 14:29:19 -08:00 |
|
Brian Behlendorf
|
f4b8f4cd57
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-05 14:29:18 -08:00 |
|
Brian Behlendorf
|
a221fd4a0f
|
Moving zu.c build system files to zfs-branch with the rest of the core build system
|
2008-12-05 14:28:05 -08:00 |
|
Brian Behlendorf
|
4da8db08b4
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-05 14:23:08 -08:00 |
|
Brian Behlendorf
|
ccb8363a3c
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-05 14:23:07 -08:00 |