Brian Behlendorf
|
f693a600d0
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 13:30:20 -08:00 |
|
Brian Behlendorf
|
206a3ac58c
|
Resolve 2 more shadow conflicts
|
2008-12-16 13:28:23 -08:00 |
|
Brian Behlendorf
|
1eee786f73
|
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
|
2008-12-16 13:22:51 -08:00 |
|
Brian Behlendorf
|
ba369a90b5
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-16 13:22:49 -08:00 |
|
Brian Behlendorf
|
0ead7ca5fe
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:49 -08:00 |
|
Brian Behlendorf
|
e8a56ea793
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 13:22:48 -08:00 |
|
Brian Behlendorf
|
2fababd82f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:45 -08:00 |
|
Brian Behlendorf
|
e329093faf
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 13:22:44 -08:00 |
|
Brian Behlendorf
|
6c694281da
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:41 -08:00 |
|
Brian Behlendorf
|
0942f2b9b3
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-16 13:22:40 -08:00 |
|
Brian Behlendorf
|
dd7493158e
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:37 -08:00 |
|
Brian Behlendorf
|
58645ef46d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-16 13:22:36 -08:00 |
|
Brian Behlendorf
|
7c2b467248
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:32 -08:00 |
|
Brian Behlendorf
|
e4addd4618
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-16 13:22:31 -08:00 |
|
Brian Behlendorf
|
96328a6517
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:28 -08:00 |
|
Brian Behlendorf
|
cbb564f839
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-16 13:22:27 -08:00 |
|
Brian Behlendorf
|
1c2b05be96
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:24 -08:00 |
|
Brian Behlendorf
|
d0a848583c
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-16 13:22:23 -08:00 |
|
Brian Behlendorf
|
3f7782e14c
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:20 -08:00 |
|
Brian Behlendorf
|
51bc222333
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-16 13:22:19 -08:00 |
|
Brian Behlendorf
|
7ad700a494
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:16 -08:00 |
|
Brian Behlendorf
|
c78fdcb14a
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 13:22:15 -08:00 |
|
Brian Behlendorf
|
d46a54ca19
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:12 -08:00 |
|
Brian Behlendorf
|
2bfe519e8b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-16 13:22:11 -08:00 |
|
Brian Behlendorf
|
60e045f042
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:08 -08:00 |
|
Brian Behlendorf
|
4a52a4dfb1
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-16 13:22:07 -08:00 |
|
Brian Behlendorf
|
4ccaff7192
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:22:04 -08:00 |
|
Brian Behlendorf
|
bd03c9c8bd
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-16 13:22:03 -08:00 |
|
Brian Behlendorf
|
1245a196dd
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-16 13:22:02 -08:00 |
|
Brian Behlendorf
|
6ccf2356fa
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:57 -08:00 |
|
Brian Behlendorf
|
265b0c920e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-16 13:21:56 -08:00 |
|
Brian Behlendorf
|
d54cedd16c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-16 13:21:55 -08:00 |
|
Brian Behlendorf
|
43766be5b3
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:50 -08:00 |
|
Brian Behlendorf
|
135c72f31a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-16 13:21:49 -08:00 |
|
Brian Behlendorf
|
867efafb94
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:46 -08:00 |
|
Brian Behlendorf
|
bd30dc023f
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-16 13:21:45 -08:00 |
|
Brian Behlendorf
|
6de142d5e5
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:42 -08:00 |
|
Brian Behlendorf
|
1d4d3c5fa8
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-16 13:21:41 -08:00 |
|
Brian Behlendorf
|
b4fc3c9ba7
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:38 -08:00 |
|
Brian Behlendorf
|
2b15c44514
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-16 13:21:37 -08:00 |
|
Brian Behlendorf
|
bf46c6e9fa
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:34 -08:00 |
|
Brian Behlendorf
|
ccaf37f78c
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-16 13:21:33 -08:00 |
|
Brian Behlendorf
|
822dbe5f5c
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:30 -08:00 |
|
Brian Behlendorf
|
a29d93cf8e
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-16 13:21:29 -08:00 |
|
Brian Behlendorf
|
b22a5e18fe
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 13:21:25 -08:00 |
|
Brian Behlendorf
|
b6178a82c1
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-16 13:21:24 -08:00 |
|
Brian Behlendorf
|
60ad9afc28
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 13:21:23 -08:00 |
|
Brian Behlendorf
|
5af8235e41
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 13:21:23 -08:00 |
|
Brian Behlendorf
|
f276d3eebc
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-16 13:19:26 -08:00 |
|
Brian Behlendorf
|
f82621d7cb
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 13:19:26 -08:00 |