Commit Graph

1466 Commits

Author SHA1 Message Date
Brian Behlendorf
40f5390865 Merge commit 'refs/top-bases/top' into top 2008-11-26 15:52:56 -08:00
Brian Behlendorf
d78fc8d529 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-11-26 15:52:55 -08:00
Brian Behlendorf
6bd8e32383 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2008-11-26 15:52:53 -08:00
Brian Behlendorf
fb69b5102c Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-11-26 15:52:52 -08:00
Brian Behlendorf
d336182e06 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-11-26 15:52:51 -08:00
Brian Behlendorf
a31b882072 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-11-26 15:52:47 -08:00
Brian Behlendorf
89c53ee235 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-11-26 15:52:45 -08:00
Brian Behlendorf
e8e14c7a86 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-11-26 15:52:42 -08:00
Brian Behlendorf
0d82cf6873 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-11-26 15:52:40 -08:00
Brian Behlendorf
a7318c9f29 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-11-26 15:52:36 -08:00
Brian Behlendorf
6ee2ad4ace Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-11-26 15:52:35 -08:00
Brian Behlendorf
f6f23f0cb8 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-11-26 15:52:31 -08:00
Brian Behlendorf
b6165811fb Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-11-26 15:52:30 -08:00
Brian Behlendorf
4b330afc63 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-11-26 15:52:25 -08:00
Brian Behlendorf
393197dc3b Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-11-26 15:52:24 -08:00
Brian Behlendorf
7f9b280afe Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-11-26 15:52:20 -08:00
Brian Behlendorf
24cb20c759 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-11-26 15:52:19 -08:00
Brian Behlendorf
9057f54b88 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-11-26 15:52:15 -08:00
Brian Behlendorf
9a0fccb82b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-11-26 15:52:13 -08:00
Brian Behlendorf
f229b778dc Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-11-26 15:52:09 -08:00
Brian Behlendorf
80b1c5f030 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-11-26 15:52:08 -08:00
Brian Behlendorf
98a6fbd10f Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-11-26 15:52:04 -08:00
Brian Behlendorf
7113c2d1ee Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-11-26 15:52:03 -08:00
Brian Behlendorf
caf7672431 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-11-26 15:51:59 -08:00
Brian Behlendorf
e68081b7ce Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-11-26 15:51:58 -08:00
Brian Behlendorf
255021b873 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-11-26 15:51:54 -08:00
Brian Behlendorf
618c202135 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-11-26 15:51:53 -08:00
Brian Behlendorf
f0a4913c3e Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-11-26 15:51:49 -08:00
Brian Behlendorf
378989fd97 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-11-26 15:51:48 -08:00
Brian Behlendorf
41a7c39b62 Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-11-26 15:51:44 -08:00
Brian Behlendorf
18aec4aa14 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-11-26 15:51:43 -08:00
Brian Behlendorf
26bba15944 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2008-11-26 15:51:39 -08:00
Brian Behlendorf
e57e3d9f43 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2008-11-26 15:51:38 -08:00
Brian Behlendorf
5c8b082e21 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-11-26 15:51:35 -08:00
Brian Behlendorf
519eca9a1e Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-11-26 15:51:34 -08:00
Brian Behlendorf
53641590a4 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-11-26 15:51:33 -08:00
Brian Behlendorf
0f083dbd8d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-11-26 15:51:32 -08:00
Brian Behlendorf
f16064bb30 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-11-26 15:51:23 -08:00
Brian Behlendorf
e99926e59e Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-11-26 15:51:20 -08:00
Brian Behlendorf
ffdf467481 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-11-26 15:51:18 -08:00
Brian Behlendorf
4d52b95f38 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-11-26 15:51:18 -08:00
Brian Behlendorf
12caf25bcb Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-11-26 15:51:17 -08:00
Brian Behlendorf
23f98050be Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2008-11-26 15:51:16 -08:00
Brian Behlendorf
34121c06f7 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-11-26 15:51:15 -08:00
Brian Behlendorf
aca4fe728e Merge branch 'gcc-no-pragmas' into refs/top-bases/gcc-branch 2008-11-26 15:51:13 -08:00
Brian Behlendorf
48c00d3e1f Merge commit 'refs/top-bases/gcc-no-pragmas' into gcc-no-pragmas 2008-11-26 15:51:13 -08:00
Brian Behlendorf
1f5d7314ab Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2008-11-26 15:51:11 -08:00
Brian Behlendorf
96d5bf9c73 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-11-26 15:51:10 -08:00
Brian Behlendorf
df29bbc60a Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-11-26 15:51:08 -08:00
Brian Behlendorf
756021703c Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-11-26 15:51:07 -08:00