Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
19,059 Commits 42 Branches 132 Tags 226 MiB
Commit Graph

2457 Commits

Author SHA1 Message Date
Brian Behlendorf 11aa5acb59 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-14 15:37:26 -07:00
Brian Behlendorf e796e2a03e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:10 -07:00
Brian Behlendorf 7eadc495c6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 15:37:05 -07:00
Brian Behlendorf b5ba75f385 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-14 15:37:03 -07:00
Brian Behlendorf dfe881c0ef Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2010-06-14 15:37:01 -07:00
Brian Behlendorf 1e7a75049a Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00
Brian Behlendorf c8d75a1c9d Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00
Brian Behlendorf d9f910d423 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 993fa8c15c Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 2c95012288 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 3135b5a26a Update gcc-c90 minor updates 
Originally these changes were on other gcc-* topic branches but
because c90 touches the same bit of code and I'd like to keep all
the gcc-* branches completely parallel I've moved these few bits
over here.  This is one of the downsides of not just having one
big patch stack.
 2010-06-14 15:32:54 -07:00
Brian Behlendorf d8e123dc27 Update gcc-unused 
Fix new instances or changes in gcc flagged unused code.  These are
mostly related to variables which are not used when debugging is
disabled and the ASSERTs are compiled out.
 2010-06-14 15:29:48 -07:00
Brian Behlendorf b41463f5e8 Update gcc-invalid-prototypes 
Fix new invalid prototypes, typically just a missing void arg.
 2010-06-14 15:25:49 -07:00
Brian Behlendorf b320a7bb4b Update gcc-unit 
Fix new possibly uninitialized variables according to gcc.
 2010-06-14 15:24:20 -07:00
Brian Behlendorf 0a8593375e Update gcc-missing-case 
Fix new locations of an incomplete case statement.
 2010-06-14 15:19:09 -07:00
Brian Behlendorf 1893aa76ec Update gcc-no-parenthesis 
Fix new locations of missing parenthesis according to gcc.
 2010-06-14 15:16:41 -07:00
Brian Behlendorf 48bd88f014 Update gcc-c90 
Additional c90 fixes required due to ZFS update, these include fixing new
places c99 specific things have been done and some cleanup of old usage.
 2010-06-14 15:15:26 -07:00
Brian Behlendorf c943bd62d4 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-14 14:44:43 -07:00
Brian Behlendorf a53a9b9e9d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-14 14:44:42 -07:00
Brian Behlendorf 6b17084f5f Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 14:44:31 -07:00
Brian Behlendorf a54633ce22 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 14:44:23 -07:00
Brian Behlendorf e0ee5701db Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 14:43:46 -07:00
Brian Behlendorf e35eb21d6a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-14 14:43:24 -07:00
Brian Behlendorf 80f7cfa759 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-14 14:43:16 -07:00
Brian Behlendorf 4152507366 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 14:43:02 -07:00
Brian Behlendorf bdf5763c0a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 14:42:58 -07:00
Brian Behlendorf 9f9a451561 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-14 14:42:57 -07:00
Brian Behlendorf fc490c18b6 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2010-06-14 14:42:56 -07:00
Brian Behlendorf dd8f6da3da Update gcc-cast 
Fix new instances of missing casts or assumed types.
 2010-06-14 14:40:10 -07:00
Brian Behlendorf 2d5e0d711a Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/zil.c
 2010-05-28 22:23:23 -07:00
Brian Behlendorf 63532dab9f Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/include/sys/zfs_context.h
 2010-05-28 22:22:13 -07:00
Brian Behlendorf a054b40984 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 
Conflicts:
	cmd/zpool/zpool_main.c
 2010-05-28 22:20:07 -07:00
Brian Behlendorf d07f996713 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zfs/zfs_ioctl.c
 2010-05-28 22:18:29 -07:00
Brian Behlendorf fe4485488c Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 
Conflicts:
	module/zcommon/include/sys/fs/zfs.h
	module/zfs/include/sys/zfs_ioctl.h
 2010-05-28 22:16:13 -07:00
Brian Behlendorf b41143632b Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 
Conflicts:
	cmd/zpool/zpool_main.c
	cmd/zpool/zpool_vdev.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_import.c
	lib/libzfs/libzfs_mount.c
	lib/libzfs/libzfs_pool.c
	lib/libzfs/libzfs_sendrecv.c
	lib/libzpool/include/sys/zfs_context.h
	module/zcommon/include/sys/fs/zfs.h
	module/zcommon/zfs_comutil.c
	module/zfs/arc.c
	module/zfs/dmu.c
	module/zfs/dmu_objset.c
	module/zfs/dmu_send.c
	module/zfs/dmu_tx.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_dir.c
	module/zfs/dsl_scrub.c
	module/zfs/fm.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/fm/fs/zfs.h
	module/zfs/include/sys/fm/protocol.h
	module/zfs/include/sys/spa.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/include/sys/zvol.h
	module/zfs/spa.c
	module/zfs/spa_boot.c
	module/zfs/spa_history.c
	module/zfs/spa_misc.c
	module/zfs/txg.c
	module/zfs/vdev.c
	module/zfs/zfs_fm.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_replay.c
	module/zfs/zfs_znode.c
	module/zfs/zil.c
	module/zfs/zio.c
 2010-05-28 22:14:39 -07:00
Brian Behlendorf 804b4e0210 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-28 21:42:29 -07:00
Brian Behlendorf 5e8f78191e Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 
Conflicts:
	module/zfs/dmu_send.c
	module/zfs/spa_history.c
	module/zfs/txg.c
	module/zfs/zfs_ioctl.c
 2010-05-28 21:31:31 -07:00
Brian Behlendorf a6c16054e5 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 
Conflicts:
	module/zcommon/include/sys/fs/zfs.h
	module/zfs/dmu.c
	module/zfs/dsl_dataset.c
	module/zfs/include/sys/dmu.h
	module/zfs/include/sys/spa.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/include/sys/zvol.h
	module/zfs/zfs_replay.c
	module/zfs/zfs_znode.c
 2010-05-28 21:26:02 -07:00
Brian Behlendorf 6860ec4c1d Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 
Conflicts:
	module/zfs/zfs_ioctl.c
 2010-05-28 16:58:21 -07:00
Brian Behlendorf 7008960b9e Merge commit 'refs/top-bases/linux-events' into linux-events 
Conflicts:
	lib/libzpool/include/sys/zfs_context.h
	module/zcommon/include/sys/fs/zfs.h
	module/zfs/dsl_scrub.c
	module/zfs/fm.c
	module/zfs/include/sys/fm/fs/zfs.h
	module/zfs/include/sys/fm/protocol.h
	module/zfs/include/sys/spa.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/spa.c
	module/zfs/spa_misc.c
	module/zfs/vdev.c
	module/zfs/zfs_fm.c
 2010-05-28 16:42:29 -07:00
Brian Behlendorf 82b9a38cdb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 16:01:54 -07:00
Brian Behlendorf 97c49607ec Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 
Conflicts:
	module/zcommon/zfs_comutil.c
	module/zfs/arc.c
	module/zfs/dmu_objset.c
	module/zfs/dmu_tx.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_dir.c
	module/zfs/spa.c
	module/zfs/spa_boot.c
	module/zfs/spa_misc.c
	module/zfs/vdev.c
	module/zfs/zil.c
	module/zfs/zio.c
 2010-05-28 16:01:35 -07:00
Brian Behlendorf 812761eac5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 
Conflicts:
	cmd/ztest/ztest.c
 2010-05-28 15:46:10 -07:00
Brian Behlendorf e27754d9e8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 
Conflicts:
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_sendrecv.c
	module/zfs/dmu_objset.c
	module/zfs/dnode.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/txg.h
	module/zfs/spa_history.c
 2010-05-28 15:45:38 -07:00
Brian Behlendorf ffaa677995 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 
Conflicts:
	module/zfs/dbuf.c
	module/zfs/dsl_dataset.c
 2010-05-28 15:38:43 -07:00
Brian Behlendorf 3e2be634a5 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 
Conflicts:
	cmd/zdb/zdb.c
	cmd/zdb/zdb_il.c
	cmd/zfs/zfs_main.c
	cmd/zfs/zfs_util.h
	cmd/zinject/zinject.h
	cmd/zpool/zpool_main.c
	cmd/zpool/zpool_util.c
	cmd/ztest/ztest.c
	lib/libnvpair/include/libnvpair.h
	lib/libnvpair/libnvpair.c
	lib/libzfs/libzfs_changelist.c
	lib/libzfs/libzfs_config.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_import.c
	lib/libzfs/libzfs_mount.c
	lib/libzfs/libzfs_pool.c
	lib/libzfs/libzfs_sendrecv.c
	module/avl/avl.c
	module/avl/include/sys/avl.h
	module/nvpair/include/sys/nvpair.h
	module/nvpair/nvpair.c
	module/zcommon/include/zfs_comutil.h
	module/zcommon/include/zfs_prop.h
	module/zcommon/zfs_comutil.c
	module/zfs/arc.c
	module/zfs/dbuf.c
	module/zfs/dmu.c
	module/zfs/dmu_objset.c
	module/zfs/dmu_zfetch.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_pool.c
	module/zfs/dsl_prop.c
	module/zfs/dsl_synctask.c
	module/zfs/include/sys/dmu_tx.h
	module/zfs/include/sys/dmu_zfetch.h
	module/zfs/include/sys/dsl_synctask.h
	module/zfs/include/sys/refcount.h
	module/zfs/include/sys/txg.h
	module/zfs/include/sys/uberblock.h
	module/zfs/include/sys/zap_leaf.h
	module/zfs/include/sys/zfs_debug.h
	module/zfs/include/sys/zfs_znode.h
	module/zfs/include/sys/zio_compress.h
	module/zfs/include/sys/zvol.h
	module/zfs/lzjb.c
	module/zfs/metaslab.c
	module/zfs/refcount.c
	module/zfs/sha256.c
	module/zfs/spa.c
	module/zfs/spa_boot.c
	module/zfs/uberblock.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
	module/zfs/zfs_ioctl.c
	module/zfs/zfs_replay.c
	module/zfs/zio.c
	module/zfs/zio_compress.c
 2010-05-28 15:34:57 -07:00
Brian Behlendorf d60fc5ca30 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 
Conflicts:
	module/zfs/dbuf.c
	module/zfs/dmu.c
	module/zfs/dmu_objset.c
	module/zfs/dnode_sync.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_prop.c
	module/zfs/metaslab.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zap_micro.c
 2010-05-28 15:07:36 -07:00
Brian Behlendorf cd47feb3c8 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 
Conflicts:
	cmd/zpool/zpool_main.c
	cmd/ztest/ztest.c
	module/zfs/arc.c
 2010-05-28 14:56:00 -07:00
Brian Behlendorf 28e07224db Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 
Conflicts:
	lib/libzfs/libzfs_dataset.c
	module/zfs/dmu_objset.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_pool.c
	module/zfs/spa.c
	module/zfs/zfs_ioctl.c
	module/zfs/zio.c
 2010-05-28 14:54:33 -07:00
Brian Behlendorf abfb2a3e1d Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 
Conflicts:
	lib/libzfs/libzfs_changelist.c
	module/zfs/spa.c
	module/zfs/zfs_ioctl.c
 2010-05-28 14:49:40 -07:00
Brian Behlendorf 3571832262 Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 
Conflicts:
	cmd/zdb/zdb.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_dataset.c
	lib/libzfs/libzfs_pool.c
	lib/libzfs/libzfs_sendrecv.c
 2010-05-28 14:46:39 -07:00
Brian Behlendorf 2591cac812 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 
Conflicts:
	cmd/zdb/zdb_il.c
	cmd/ztest/ztest.c
	lib/libzfs/libzfs_mount.c
 2010-05-28 14:42:40 -07:00
Brian Behlendorf 475bf41d1c Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 
Conflicts:
	cmd/zfs/zfs_main.c
	cmd/zpool/zpool_main.c
	cmd/ztest/ztest.c
 2010-05-28 14:36:18 -07:00
Brian Behlendorf 957b7b41d4 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 
Conflicts:
	cmd/zdb/zdb.c
	cmd/ztest/ztest.c
	module/zfs/dbuf.c
	module/zfs/dsl_dataset.c
	module/zfs/dsl_scrub.c
	module/zfs/spa.c
	module/zfs/vdev.c
	module/zfs/zio.c
 2010-05-28 14:19:22 -07:00
Brian Behlendorf 31630287ca Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 
Conflicts:
	lib/libzfs/libzfs_sendrecv.c
	module/zfs/dmu_objset.c
	module/zfs/dnode.c
	module/zfs/dsl_dataset.c
	module/zfs/spa_history.c
 2010-05-28 13:51:29 -07:00
Brian Behlendorf ab1a68b225 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 
Conflicts:
	module/zfs/dnode_sync.c
 2010-05-28 13:46:45 -07:00
Brian Behlendorf 428870ff73 Update core ZFS code from build 121 to build 141. 2010-05-28 13:45:14 -07:00
Brian Behlendorf ea356d9855 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 12:43:02 -07:00
Brian Behlendorf 6324adf280 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-28 12:43:01 -07:00
Brian Behlendorf 885089decd Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-28 12:42:57 -07:00
Brian Behlendorf 79e7a65233 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-28 12:42:55 -07:00
Brian Behlendorf 525b1f371b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-28 12:42:44 -07:00
Brian Behlendorf 0e19c10052 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-28 12:42:37 -07:00
Brian Behlendorf 9f27168dfc Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 12:42:35 -07:00
Brian Behlendorf 002809a885 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-28 12:42:31 -07:00
Brian Behlendorf 06da6ccf97 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 12:42:30 -07:00
Brian Behlendorf 818eafca5b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-05-28 12:42:30 -07:00
Brian Behlendorf c91169c7c5 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 
Conflicts:
	lib/libzfs/libzfs_util.c
 2010-05-28 12:42:27 -07:00
Brian Behlendorf fb72c6ef81 Revert gcc-shadow using -Wno-shadow I can live with 
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts.  Anyway, this ends up being
more simply gratutous change than I care for.
 2010-05-28 12:34:45 -07:00
Brian Behlendorf 2d2503b90d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 10:17:00 -07:00
Brian Behlendorf 5b621f7d08 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-28 10:16:59 -07:00
Brian Behlendorf d5fbdc7aad Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-28 10:16:41 -07:00
Brian Behlendorf 75e146efe5 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-28 10:16:32 -07:00
Brian Behlendorf 876b0e797f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-28 10:15:43 -07:00
Brian Behlendorf d272a44f96 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-28 10:15:14 -07:00
Brian Behlendorf d19bda5de8 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 10:15:04 -07:00
Brian Behlendorf f1e0deaa81 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-28 10:14:45 -07:00
Brian Behlendorf 3450d1f3b5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 10:14:43 -07:00
Brian Behlendorf af051f1250 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 10:14:43 -07:00
Brian Behlendorf 157df8338c Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2010-05-28 10:14:42 -07:00
Brian Behlendorf 9eec97e163 Revert fix-dsl_pool_t fixed upstream 2010-05-28 10:08:02 -07:00
Brian Behlendorf 165448b8b9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-28 10:03:03 -07:00
Brian Behlendorf 5ba0f3c2f1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-28 10:03:02 -07:00
Brian Behlendorf 54f70fc689 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-28 10:02:44 -07:00
Brian Behlendorf 19e6776b1d Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-28 10:02:34 -07:00
Brian Behlendorf 62aa268004 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-28 10:01:45 -07:00
Brian Behlendorf bf8485c9d2 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-28 10:01:15 -07:00
Brian Behlendorf f6f8a76860 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-28 10:01:05 -07:00
Brian Behlendorf 410adb5765 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-28 10:00:46 -07:00
Brian Behlendorf c2c3358a6f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 10:00:44 -07:00
Brian Behlendorf 11510b3513 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 10:00:44 -07:00
Brian Behlendorf 396fb1e235 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-05-28 10:00:43 -07:00
Brian Behlendorf 11a9bfc7f8 Revert fix-taskq changes reevaluate after update. 2010-05-28 09:54:03 -07:00
Brian Behlendorf 0178413564 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-05-27 17:04:35 -07:00
Brian Behlendorf b8d1101327 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-05-27 17:04:34 -07:00
Brian Behlendorf db0b37a11d Merge commit 'refs/top-bases/linux-events' into linux-events 2010-05-27 17:04:16 -07:00
Brian Behlendorf 26f30a4c14 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-05-27 17:04:06 -07:00
Brian Behlendorf 6b667c9a1c Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-27 17:03:17 -07:00
Brian Behlendorf 74f42d24c7 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-05-27 17:02:46 -07:00
Brian Behlendorf fb7a18aa41 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-05-27 17:02:36 -07:00