OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/fs/jfs
History
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
 		2010-10-24 13:41:39 -07:00
..
Kconfig jfs: needs crc32_le 2009-02-02 13:43:28 -06:00
Makefile JFS: ext2 inode attributes for jfs 2006-02-09 09:09:16 -06:00
acl.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
endian24.h JFS: Whitespace cleanup and remove some dead code 2007-06-06 15:28:35 -05:00
file.c remove inode_setattr 2010-08-09 16:47:37 -04:00
inode.c switch jfs to ->evict_inode() 2010-08-09 16:48:17 -04:00
ioctl.c [PATCH] r/o bind mounts: elevate write count for ioctls() 2008-04-19 00:29:24 -04:00
jfs_acl.h dquot: move dquot transfer responsibility into the filesystem 2010-03-05 00:20:28 +01:00
jfs_btree.h JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_debug.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
jfs_debug.h JFS: switch to seq_files 2008-05-13 08:22:10 -05:00
jfs_dinode.h BKL-removal: Implement a compat_ioctl handler for JFS 2008-02-07 13:45:29 -06:00
jfs_dmap.c Merge branch 'master' into for-next 2010-04-23 02:08:44 +02:00
jfs_dmap.h jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g 2010-02-02 14:21:35 -06:00
jfs_dtree.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
jfs_dtree.h jfs: remove DIRENTSIZ 2008-06-10 15:12:58 -05:00
jfs_extent.c dquot: cleanup space allocation / freeing routines 2010-03-05 00:20:28 +01:00
jfs_extent.h JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_filsys.h JFS: Whitespace cleanup and remove some dead code 2007-06-06 15:28:35 -05:00
jfs_imap.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
jfs_imap.h JFS: Whitespace cleanup and remove some dead code 2007-06-06 15:28:35 -05:00
jfs_incore.h switch jfs to inode->i_acl 2009-06-24 08:17:04 -04:00
jfs_inode.c jfs: replace inode uid,gid,mode init with helper 2010-05-21 18:31:23 -04:00
jfs_inode.h switch jfs to ->evict_inode() 2010-08-09 16:48:17 -04:00
jfs_lock.h JFS: use __set_current_state() 2007-04-26 07:30:29 -05:00
jfs_logmgr.c Fix various typos of valid in comments 2010-09-21 17:04:50 +02:00
jfs_logmgr.h more low-hanging fruits - kernel, fs, lib signedness 2007-10-14 12:41:52 -07:00
jfs_metapage.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
jfs_metapage.h JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_mount.c fix printk typo 'faild' 2010-08-09 11:25:17 +02:00
jfs_superblock.h JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_txnmgr.c kill I_LOCK 2009-12-17 11:03:25 -05:00
jfs_txnmgr.h JFS: Whitespace cleanup and remove some dead code 2007-06-06 15:28:35 -05:00
jfs_types.h jfs: remove xtLookupList() 2009-01-09 15:42:04 -06:00
jfs_umount.c JFS: Make sure special inode data is written after journal is flushed 2008-01-03 13:11:37 -06:00
jfs_unicode.c JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_unicode.h include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
jfs_uniupr.c JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_xattr.h JFS: White space cleanup 2006-10-02 09:55:27 -05:00
jfs_xtree.c dquot: cleanup space allocation / freeing routines 2010-03-05 00:20:28 +01:00
jfs_xtree.h jfs: remove xtLookupList() 2009-01-09 15:42:04 -06:00
namei.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 2010-04-21 12:30:07 -07:00
resize.c jfs: fix diAllocExt error in resizing filesystem 2010-04-16 08:01:20 -05:00
super.c BKL: Remove BKL from JFS 2010-10-04 21:10:40 +02:00
symlink.c jfs: add jfs specific ->setattr call 2010-04-16 08:05:50 -05:00
xattr.c jfs: don't allow os2 xattr namespace overlap with others 2010-08-10 15:33:09 -07:00