29f04b4be4
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-27 20:06:11 -07:00
e4d0d5c10c
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 20:06:10 -07:00
9644f95585
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-27 20:06:10 -07:00
be3f503d82
Remove fix-clock-wrap dependency from fix-branch
2010-05-27 19:59:32 -07:00
bec63bd0a1
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-27 17:04:49 -07:00
4e2d9ca0f7
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-27 17:04:48 -07:00
d29daacee7
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-27 17:04:46 -07:00
a9ea79346f
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 17:04:45 -07:00
1b14127256
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-27 17:04:36 -07:00
0178413564
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-27 17:04:35 -07:00
b8d1101327
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-27 17:04:34 -07:00
44b2dd9f12
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-27 17:04:17 -07:00
db0b37a11d
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-27 17:04:16 -07:00
a502c75403
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-27 17:04:07 -07:00
26f30a4c14
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-27 17:04:06 -07:00
58fb65191a
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-27 17:03:58 -07:00
d35bfe0338
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-27 17:03:56 -07:00
1633ebdbfe
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-27 17:03:48 -07:00
2719652ebf
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-27 17:03:46 -07:00
3d7cf410f3
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-27 17:03:38 -07:00
e29fa3eeae
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-27 17:03:37 -07:00
d42794022a
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-27 17:03:28 -07:00
2c43eeb7ec
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 17:03:27 -07:00
f819215136
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-27 17:03:18 -07:00
6b667c9a1c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-27 17:03:17 -07:00
295f1b5a6d
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-27 17:03:08 -07:00
0ab548c390
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-27 17:03:06 -07:00
9ca6168420
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-27 17:02:58 -07:00
e3f19ca711
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-27 17:02:56 -07:00
5d105e7dd7
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-27 17:02:47 -07:00
74f42d24c7
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-27 17:02:46 -07:00
3d5997879c
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-27 17:02:37 -07:00
fb7a18aa41
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-27 17:02:36 -07:00
acb2b2e3c5
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-27 17:02:27 -07:00
687ffba830
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-27 17:02:26 -07:00
35c6907c74
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-27 17:02:17 -07:00
c79c9b05ab
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-27 17:02:15 -07:00
2fbe461b55
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-27 17:02:15 -07:00
a7dcb2247a
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-27 17:02:14 -07:00
03fdccb846
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-27 17:02:14 -07:00
146ded4db2
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-05-27 17:02:13 -07:00
db069704ed
Revert fix-clock-wrap fixed upstream
...
This was more or less fixed upstream. Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.
2010-05-27 16:54:23 -07:00
9e84f03f3a
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-27 16:43:10 -07:00
7115f2086e
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-27 16:43:08 -07:00
94d8dd395e
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-27 16:43:07 -07:00
05a2a919c8
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-27 16:43:05 -07:00
15b01c2516
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-27 16:42:57 -07:00
7a3958fd05
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-27 16:42:56 -07:00
f6b3017eb0
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-27 16:42:55 -07:00
9f45ab7bf4
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-27 16:42:38 -07:00
Brian Behlendorf