Brian Behlendorf
|
d79dfa84c8
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:41:28 -08:00 |
|
Brian Behlendorf
|
727a4622dc
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-05 12:41:24 -08:00 |
|
Brian Behlendorf
|
9efc2b6ca8
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:41:18 -08:00 |
|
Brian Behlendorf
|
9c73332e81
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 12:41:15 -08:00 |
|
Brian Behlendorf
|
402d2ae37a
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:41:08 -08:00 |
|
Brian Behlendorf
|
144eca0e84
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 12:41:04 -08:00 |
|
Brian Behlendorf
|
f668f991b4
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:58 -08:00 |
|
Brian Behlendorf
|
d5350109f4
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-05 12:40:55 -08:00 |
|
Brian Behlendorf
|
97af0dcdbc
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:50 -08:00 |
|
Brian Behlendorf
|
6ce317a8d5
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-05 12:40:48 -08:00 |
|
Brian Behlendorf
|
e47b15f886
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:41 -08:00 |
|
Brian Behlendorf
|
1751caa615
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-01-05 12:40:38 -08:00 |
|
Brian Behlendorf
|
5d49f45c50
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-01-05 12:40:37 -08:00 |
|
Brian Behlendorf
|
beb2376e5d
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:28 -08:00 |
|
Brian Behlendorf
|
1dd185c19d
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-05 12:40:26 -08:00 |
|
Brian Behlendorf
|
9c2bf69ecb
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-05 12:40:25 -08:00 |
|
Brian Behlendorf
|
999fe3c9ca
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:15 -08:00 |
|
Brian Behlendorf
|
9cd0ad6ce7
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-01-05 12:40:13 -08:00 |
|
Brian Behlendorf
|
1e1eb18284
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:40:07 -08:00 |
|
Brian Behlendorf
|
0d1e4f9d15
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-01-05 12:40:05 -08:00 |
|
Brian Behlendorf
|
94ab61bbf3
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:39:59 -08:00 |
|
Brian Behlendorf
|
c8fa7c9b23
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-01-05 12:39:56 -08:00 |
|
Brian Behlendorf
|
2924c62a3a
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:39:49 -08:00 |
|
Brian Behlendorf
|
ce248fc03d
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-01-05 12:39:45 -08:00 |
|
Brian Behlendorf
|
3217e99e28
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:39:41 -08:00 |
|
Brian Behlendorf
|
fe1e3df517
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-01-05 12:39:39 -08:00 |
|
Brian Behlendorf
|
edb991c115
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:39:34 -08:00 |
|
Brian Behlendorf
|
c2998862c5
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-01-05 12:39:31 -08:00 |
|
Brian Behlendorf
|
9a0cb95b1b
|
Resolve conflict
|
2009-01-05 12:38:23 -08:00 |
|
Brian Behlendorf
|
9e7be26939
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-05 12:36:21 -08:00 |
|
Brian Behlendorf
|
ce7115b807
|
Add unicode makefile references and support
|
2009-01-05 12:33:09 -08:00 |
|
Brian Behlendorf
|
ced77c2f1b
|
Add unicode makefile references and support
|
2009-01-05 12:32:55 -08:00 |
|
Brian Behlendorf
|
8e63f795ee
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:13:10 -08:00 |
|
Brian Behlendorf
|
7a14126594
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-05 12:13:07 -08:00 |
|
Brian Behlendorf
|
b4f648c111
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:13:01 -08:00 |
|
Brian Behlendorf
|
d4b4b6131f
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-01-05 12:12:57 -08:00 |
|
Brian Behlendorf
|
bf53cef2d1
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:12:48 -08:00 |
|
Brian Behlendorf
|
ff51e2110c
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-01-05 12:12:46 -08:00 |
|
Brian Behlendorf
|
123d6eb144
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:12:37 -08:00 |
|
Brian Behlendorf
|
ddcdf90ceb
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-01-05 12:12:33 -08:00 |
|
Brian Behlendorf
|
9b3c970bd3
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:12:24 -08:00 |
|
Brian Behlendorf
|
c324118684
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-01-05 12:12:20 -08:00 |
|
Brian Behlendorf
|
f4cee9b553
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:12:12 -08:00 |
|
Brian Behlendorf
|
e49cbb65ad
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-01-05 12:12:08 -08:00 |
|
Brian Behlendorf
|
b196a1f8de
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:12:00 -08:00 |
|
Brian Behlendorf
|
98d1fc4228
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-01-05 12:11:57 -08:00 |
|
Brian Behlendorf
|
9838c16601
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:11:50 -08:00 |
|
Brian Behlendorf
|
774375d168
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-01-05 12:11:47 -08:00 |
|
Brian Behlendorf
|
092fe78216
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-01-05 12:11:39 -08:00 |
|
Brian Behlendorf
|
bde3267f84
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-01-05 12:11:36 -08:00 |