Brian Behlendorf
|
2d5f580b54
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:39 -08:00 |
|
Brian Behlendorf
|
c28d08a363
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 15:07:38 -08:00 |
|
Brian Behlendorf
|
94b71f0bf3
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:34 -08:00 |
|
Brian Behlendorf
|
faf6c753bd
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 15:07:33 -08:00 |
|
Brian Behlendorf
|
cd3ba16270
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:30 -08:00 |
|
Brian Behlendorf
|
f6421585ad
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 15:07:29 -08:00 |
|
Brian Behlendorf
|
3219e6f05c
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:26 -08:00 |
|
Brian Behlendorf
|
a74ec0ff24
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 15:07:24 -08:00 |
|
Brian Behlendorf
|
d63a31165a
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:21 -08:00 |
|
Brian Behlendorf
|
944105c6eb
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-12 15:07:20 -08:00 |
|
Brian Behlendorf
|
93137cbddc
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-12 15:07:19 -08:00 |
|
Brian Behlendorf
|
9aab04fa9c
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:14 -08:00 |
|
Brian Behlendorf
|
03afba43b4
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-12 15:07:13 -08:00 |
|
Brian Behlendorf
|
54cb07032d
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-12 15:07:12 -08:00 |
|
Brian Behlendorf
|
03fee30af7
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:07 -08:00 |
|
Brian Behlendorf
|
2e7dffd82a
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-12 15:07:06 -08:00 |
|
Brian Behlendorf
|
3752d88e51
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:07:02 -08:00 |
|
Brian Behlendorf
|
f8d8327aa5
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-12 15:07:01 -08:00 |
|
Brian Behlendorf
|
7b327a54e0
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:06:58 -08:00 |
|
Brian Behlendorf
|
8917e616ba
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-12 15:06:57 -08:00 |
|
Brian Behlendorf
|
aa54672547
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:06:54 -08:00 |
|
Brian Behlendorf
|
6aa2e19167
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-12 15:06:52 -08:00 |
|
Brian Behlendorf
|
5edac7a997
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:06:49 -08:00 |
|
Brian Behlendorf
|
34eb8a78c8
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-12 15:06:48 -08:00 |
|
Brian Behlendorf
|
a24661dbf9
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:06:45 -08:00 |
|
Brian Behlendorf
|
dfea26b055
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-12 15:06:44 -08:00 |
|
Brian Behlendorf
|
3ce8541e83
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-12 15:06:41 -08:00 |
|
Brian Behlendorf
|
1cff5bb061
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-12 15:06:39 -08:00 |
|
Brian Behlendorf
|
d145044d80
|
Refresh Makefile
|
2008-12-12 15:04:48 -08:00 |
|
Brian Behlendorf
|
33ba2c56d1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:48 -08:00 |
|
Brian Behlendorf
|
d7556c1578
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-12 14:57:47 -08:00 |
|
Brian Behlendorf
|
b90f6993e9
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:43 -08:00 |
|
Brian Behlendorf
|
be857e8dc4
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-12 14:57:42 -08:00 |
|
Brian Behlendorf
|
c1b0317ce0
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:38 -08:00 |
|
Brian Behlendorf
|
57dac8ad35
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-12 14:57:37 -08:00 |
|
Brian Behlendorf
|
2acb29fbfd
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:33 -08:00 |
|
Brian Behlendorf
|
b694f3fbc5
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-12 14:57:32 -08:00 |
|
Brian Behlendorf
|
fcb7c22109
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:29 -08:00 |
|
Brian Behlendorf
|
df86df7535
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-12 14:57:27 -08:00 |
|
Brian Behlendorf
|
bbd6bed176
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:24 -08:00 |
|
Brian Behlendorf
|
a9cab3bd4a
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-12 14:57:22 -08:00 |
|
Brian Behlendorf
|
b3e62a6ad5
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:19 -08:00 |
|
Brian Behlendorf
|
8a1b500e65
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-12 14:57:17 -08:00 |
|
Brian Behlendorf
|
273d9b1a29
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:14 -08:00 |
|
Brian Behlendorf
|
9787903adb
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-12 14:57:13 -08:00 |
|
Brian Behlendorf
|
2586be28b0
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:09 -08:00 |
|
Brian Behlendorf
|
06a700c073
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-12 14:57:08 -08:00 |
|
Brian Behlendorf
|
f87ddd93e3
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:04 -08:00 |
|
Brian Behlendorf
|
1e0ff074a9
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-12 14:57:03 -08:00 |
|
Brian Behlendorf
|
1a5749856c
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-12 14:57:00 -08:00 |