Brian Behlendorf
|
f2a7724084
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:25 -08:00 |
|
Brian Behlendorf
|
0adbfd4cfb
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:21:24 -08:00 |
|
Brian Behlendorf
|
49a975f0d0
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:20 -08:00 |
|
Brian Behlendorf
|
bc55a1e29b
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:21:19 -08:00 |
|
Brian Behlendorf
|
d42c443a8a
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:15 -08:00 |
|
Brian Behlendorf
|
9d3a835a0f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:21:14 -08:00 |
|
Brian Behlendorf
|
daf54d1001
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:11 -08:00 |
|
Brian Behlendorf
|
f1132655d6
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 14:21:10 -08:00 |
|
Brian Behlendorf
|
3a440f5607
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 14:21:09 -08:00 |
|
Brian Behlendorf
|
f33088b3f4
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:21:04 -08:00 |
|
Brian Behlendorf
|
6278a8f9a5
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 14:21:02 -08:00 |
|
Brian Behlendorf
|
2db44f84d7
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 14:21:02 -08:00 |
|
Brian Behlendorf
|
d445c410fb
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:20:56 -08:00 |
|
Brian Behlendorf
|
948a4e0e2c
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 14:20:55 -08:00 |
|
Brian Behlendorf
|
9c1484a97e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:20:52 -08:00 |
|
Brian Behlendorf
|
5acf1eec02
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 14:20:51 -08:00 |
|
Brian Behlendorf
|
8b7107d34d
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:20:48 -08:00 |
|
Brian Behlendorf
|
ea758a9eea
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 14:20:46 -08:00 |
|
Brian Behlendorf
|
c3d42b2d23
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:20:43 -08:00 |
|
Brian Behlendorf
|
23c4e402f7
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 14:20:42 -08:00 |
|
Brian Behlendorf
|
c290cb527d
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:20:39 -08:00 |
|
Brian Behlendorf
|
570200410e
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 14:20:38 -08:00 |
|
Brian Behlendorf
|
2ee3f66f0d
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:20:35 -08:00 |
|
Brian Behlendorf
|
724265224b
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 14:20:34 -08:00 |
|
Brian Behlendorf
|
1bbe898289
|
Resolve conflict
|
2008-12-12 14:19:55 -08:00 |
|
Brian Behlendorf
|
d28f2403f2
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 14:18:44 -08:00 |
|
Brian Behlendorf
|
5a27f3f0a5
|
Comment out libzpool builds for now
|
2008-12-12 14:16:50 -08:00 |
|
Brian Behlendorf
|
acfdb41034
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-12 14:08:15 -08:00 |
|
Brian Behlendorf
|
b4f28b84c0
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:08:15 -08:00 |
|
Brian Behlendorf
|
1c38136eed
|
Resolve conflict
|
2008-12-12 14:08:10 -08:00 |
|
Brian Behlendorf
|
525c79811a
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:29 -08:00 |
|
Brian Behlendorf
|
6cae844981
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 14:02:28 -08:00 |
|
Brian Behlendorf
|
1bdc94bfd3
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:25 -08:00 |
|
Brian Behlendorf
|
8429981d4d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:02:24 -08:00 |
|
Brian Behlendorf
|
3a8d9dc4af
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:20 -08:00 |
|
Brian Behlendorf
|
1f7220674a
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 14:02:19 -08:00 |
|
Brian Behlendorf
|
eaf091a991
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:16 -08:00 |
|
Brian Behlendorf
|
4ad6161f1c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 14:02:15 -08:00 |
|
Brian Behlendorf
|
ad390da296
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:12 -08:00 |
|
Brian Behlendorf
|
1a42ebb0c1
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 14:02:10 -08:00 |
|
Brian Behlendorf
|
373e09f1b8
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:07 -08:00 |
|
Brian Behlendorf
|
6687a81391
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 14:02:06 -08:00 |
|
Brian Behlendorf
|
e57c876266
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:02:03 -08:00 |
|
Brian Behlendorf
|
231e0793af
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:02:02 -08:00 |
|
Brian Behlendorf
|
ec0b7cdb79
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:58 -08:00 |
|
Brian Behlendorf
|
d325eac85e
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:01:57 -08:00 |
|
Brian Behlendorf
|
165a1c4ea1
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:54 -08:00 |
|
Brian Behlendorf
|
4c62027f0f
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:01:53 -08:00 |
|
Brian Behlendorf
|
28cac2f2b2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:01:50 -08:00 |
|
Brian Behlendorf
|
c4d2427b6d
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 14:01:49 -08:00 |