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
..
heartbeat.c	ocfs2/cluster: Release debugfs file elapsed_time_in_ms	2010-10-15 11:57:21 -07:00
heartbeat.h	ocfs2/cluster: Get all heartbeat regions	2010-10-07 14:31:06 -07:00
Makefile	ocfs2/net: Add debug interface to o2net	2008-04-18 08:56:20 -07:00
masklog.c	ocfs2: allocation reservations	2010-05-05 18:17:30 -07:00
masklog.h	ocfs2/cluster: Print messages when adding/removing nodes	2010-10-07 17:30:17 -07:00
netdebug.c	inet: rename some inet_sock fields	2009-10-18 18:52:53 -07:00
nodemanager.c	ocfs2/cluster: Print messages when adding/removing nodes	2010-10-07 17:30:17 -07:00
nodemanager.h	ocfs2/cluster: Make fence method configurable - v2	2009-12-02 16:49:26 -08:00
ocfs2_heartbeat.h	ocfs2: warn the user on a dead timeout mismatch	2006-06-29 15:45:35 -07:00
ocfs2_nodemanager.h	ocfs2/dlm: Add message DLM_QUERY_REGION	2010-10-09 10:26:23 -07:00
quorum.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
quorum.h
sys.c	ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)	2008-04-30 17:07:59 -07:00
sys.h
tcp.c	ocfs2/cluster: Check slots for unconfigured live nodes	2010-10-07 17:00:16 -07:00
tcp.h	[PATCH 1/3] ocfs2/net: Silence build warnings	2008-05-30 15:15:04 -07:00
tcp_internal.h	Fix various typos of valid in comments	2010-09-21 17:04:50 +02:00
ver.c	ocfs2: bump version number	2008-01-25 15:05:46 -08:00
ver.h