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
..
at91_cf.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
au1000_generic.c	pcmcia: don't call flush_scheduled_work() spuriously	2010-10-16 11:07:37 +02:00
au1000_generic.h	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
au1000_pb1x00.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
bcm63xx_pcmcia.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
bcm63xx_pcmcia.h
bfin_cf_pcmcia.c	pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket	2010-05-10 10:23:12 +02:00
cardbus.c	pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket	2010-05-10 10:23:12 +02:00
cirrus.h
cistpl.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
cs_internal.h	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
cs.c	pcmcia: fix unused function compile warning	2010-10-14 11:47:16 +02:00
db1xxx_ss.c	pcmcia: remove cs_types.h	2010-07-30 21:07:39 +02:00
ds.c	pcmcia: move driver name to struct pcmcia_driver	2010-09-29 17:20:24 +02:00
electra_cf.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
i82092.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
i82092aa.h
i82365.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
i82365.h	pcmcia: honor saved flags in yenta_socket's I365_CSCINT register	2010-03-15 14:50:15 +01:00
Kconfig	Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable	2010-08-06 18:10:25 +01:00
m8xx_pcmcia.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
m32r_cfc.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
m32r_cfc.h
m32r_pcc.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
m32r_pcc.h
Makefile	Merge branches 'master' and 'devel' into for-linus	2010-08-10 23:17:52 +01:00
o2micro.h	pcmcia/yenta: guide users in case of problems with O2-bridges	2010-10-15 14:31:47 +02:00
omap_cf.c	pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket	2010-05-10 10:23:12 +02:00
pcmcia_cis.c	pcmcia: use autoconfiguration feature for ioports and iomem	2010-09-29 17:20:24 +02:00
pcmcia_resource.c	pcmcia: IOCARD is also required for using IRQs	2010-10-22 08:46:36 +02:00
pd6729.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
pd6729.h
pxa2xx_balloon3.c	[ARM] pxa/balloon3: PCMCIA Support	2010-08-05 14:32:45 +08:00
pxa2xx_base.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-08-06 12:25:06 -07:00
pxa2xx_base.h	PCMCIA: fix pxa2xx_lubbock modular build error	2009-12-12 10:08:12 +00:00
pxa2xx_cm_x2xx.c
pxa2xx_cm_x255.c
pxa2xx_cm_x270.c
pxa2xx_e740.c
pxa2xx_lubbock.c
pxa2xx_mainstone.c
pxa2xx_palmld.c
pxa2xx_palmtc.c	ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq	2009-12-13 16:33:13 +00:00
pxa2xx_palmtx.c
pxa2xx_sharpsl.c
pxa2xx_stargate2.c	ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq	2009-12-13 16:33:13 +00:00
pxa2xx_trizeps4.c
pxa2xx_viper.c	[ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus	2009-12-13 21:42:58 +08:00
pxa2xx_vpac270.c	[ARM] pxa: add support for Voipac PXA270 PCMCIA	2010-05-11 17:25:02 +02:00
ricoh.h
rsrc_iodyn.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
rsrc_mgr.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
rsrc_nonstatic.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
sa11xx_base.c	fix typos concerning "initiali[zs]e"	2010-06-16 18:05:05 +02:00
sa11xx_base.h
sa1100_assabet.c
sa1100_badge4.c
sa1100_cerf.c
sa1100_generic.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
sa1100_generic.h
sa1100_h3600.c	ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100	2009-12-06 16:52:57 +00:00
sa1100_jornada720.c
sa1100_neponset.c
sa1100_shannon.c
sa1100_simpad.c
sa1111_generic.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
sa1111_generic.h
soc_common.c	pcmcia: don't call flush_scheduled_work() spuriously	2010-10-16 11:07:37 +02:00
soc_common.h	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
socket_sysfs.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
tcic.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
tcic.h
ti113x.h	pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary	2010-03-15 14:50:16 +01:00
topic.h
vg468.h
vrc4171_card.c	pcmcia: use dev_pm_ops for class pcmcia_socket_class	2010-03-24 11:00:11 +01:00
vrc4173_cardu.c	pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable_device	2010-10-05 15:49:51 +02:00
vrc4173_cardu.h
xxs1500_ss.c	pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device	2010-09-29 17:20:23 +02:00
yenta_socket.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
yenta_socket.h