Brian Behlendorf
|
2b86faed0a
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:36:23 -08:00 |
|
Brian Behlendorf
|
bcc03544c9
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-11 15:36:22 -08:00 |
|
Brian Behlendorf
|
cf06f2f58f
|
Whoops put these back
|
2008-12-11 15:34:32 -08:00 |
|
Brian Behlendorf
|
652388f3fb
|
Moving all lib/libspl contexts to linux-libspl branch
|
2008-12-11 15:31:48 -08:00 |
|
Brian Behlendorf
|
b62b4773d1
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:28:31 -08:00 |
|
Brian Behlendorf
|
a2d1d32c17
|
move vdev_disk to it's new home
|
2008-12-11 15:26:36 -08:00 |
|
Brian Behlendorf
|
fb24b30a5e
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:24:56 -08:00 |
|
Brian Behlendorf
|
526bb71c86
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 15:24:53 -08:00 |
|
Brian Behlendorf
|
efc21c477d
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:24:37 -08:00 |
|
Brian Behlendorf
|
d4ba0b9b50
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 15:24:35 -08:00 |
|
Brian Behlendorf
|
c4de553f18
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 15:24:32 -08:00 |
|
Brian Behlendorf
|
cdc7d2613e
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:24:07 -08:00 |
|
Brian Behlendorf
|
444d9f20c3
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 15:24:05 -08:00 |
|
Brian Behlendorf
|
6cc6f50a02
|
Move to new home
|
2008-12-11 15:21:20 -08:00 |
|
Brian Behlendorf
|
f5290f405c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:19:18 -08:00 |
|
Brian Behlendorf
|
fc5f5929e7
|
move zpios to the correct dirs
|
2008-12-11 15:17:33 -08:00 |
|
Brian Behlendorf
|
9245824527
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:08:23 -08:00 |
|
Brian Behlendorf
|
d46b60f374
|
Move libspl to new location
|
2008-12-11 15:06:34 -08:00 |
|
Brian Behlendorf
|
00518c99af
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:51 -08:00 |
|
Brian Behlendorf
|
be5e4ee04f
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-11 15:00:50 -08:00 |
|
Brian Behlendorf
|
b2b2adc28d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:47 -08:00 |
|
Brian Behlendorf
|
94adb17675
|
Resolve conflict
|
2008-12-11 15:00:43 -08:00 |
|
Brian Behlendorf
|
d74c5362b3
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:24 -08:00 |
|
Brian Behlendorf
|
686c93db12
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-11 15:00:23 -08:00 |
|
Brian Behlendorf
|
541fe61a34
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:20 -08:00 |
|
Brian Behlendorf
|
2c028659ab
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-11 15:00:19 -08:00 |
|
Brian Behlendorf
|
85df356322
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:15 -08:00 |
|
Brian Behlendorf
|
707c548a35
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-11 15:00:14 -08:00 |
|
Brian Behlendorf
|
1c76983586
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:11 -08:00 |
|
Brian Behlendorf
|
589e125bab
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-11 15:00:10 -08:00 |
|
Brian Behlendorf
|
4f564c40dc
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:06 -08:00 |
|
Brian Behlendorf
|
07121d5189
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-11 15:00:05 -08:00 |
|
Brian Behlendorf
|
5c9502d6e8
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-11 15:00:02 -08:00 |
|
Brian Behlendorf
|
477a85d905
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-11 15:00:01 -08:00 |
|
Brian Behlendorf
|
7b5e2835b1
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:58 -08:00 |
|
Brian Behlendorf
|
6d37a4ad97
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-11 14:59:57 -08:00 |
|
Brian Behlendorf
|
e9c415ec2d
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:53 -08:00 |
|
Brian Behlendorf
|
d68cecbb9d
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-11 14:59:52 -08:00 |
|
Brian Behlendorf
|
1ac058d938
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:49 -08:00 |
|
Brian Behlendorf
|
c35e513cc4
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-11 14:59:48 -08:00 |
|
Brian Behlendorf
|
347e860de3
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-11 14:59:47 -08:00 |
|
Brian Behlendorf
|
b256a78467
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:42 -08:00 |
|
Brian Behlendorf
|
409a33d29e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-11 14:59:41 -08:00 |
|
Brian Behlendorf
|
515c1981f2
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-11 14:59:39 -08:00 |
|
Brian Behlendorf
|
106c43dc72
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:33 -08:00 |
|
Brian Behlendorf
|
f46d4ce0a4
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-11 14:59:32 -08:00 |
|
Brian Behlendorf
|
10ec661566
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:29 -08:00 |
|
Brian Behlendorf
|
72a1fc3136
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-11 14:59:28 -08:00 |
|
Brian Behlendorf
|
6d21860354
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-11 14:59:25 -08:00 |
|
Brian Behlendorf
|
f27584417a
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-11 14:59:24 -08:00 |