linux-sg2042/drivers/net/irda
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 net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -07:00
Makefile net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -07:00
act200l-sir.c
actisys-sir.c
ali-ircc.c Fix typo: configuation => configuration 2010-09-23 11:46:48 +02:00
ali-ircc.h
au1k_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
au1000_ircc.h
bfin_sir.c net/irda: bfin_sir: IRDA is not affected by anomaly 05000230 2010-05-23 23:57:45 -07:00
bfin_sir.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
donauboe.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
donauboe.h Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
ep7211-sir.c
esi-sir.c
girbil-sir.c
irda-usb.c irda: Test index before read in stir421x_patch_device() 2010-10-11 02:11:58 +02:00
irda-usb.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
irtty-sir.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
irtty-sir.h
kingsun-sir.c headers: kref.h redux 2009-09-26 10:17:19 -07:00
ks959-sir.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
ksdazzle-sir.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
litelink-sir.c
ma600-sir.c
mcp2120-sir.c
mcs7780.c drivers/net/irda: Adjust confusing if indentation 2010-08-16 21:06:26 -07:00
mcs7780.h irda: convert to netdev_tx_t 2009-09-01 01:13:38 -07:00
nsc-ircc.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
nsc-ircc.h
old_belkin-sir.c
pxaficp_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
sa1100_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
sh_irda.c Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable 2010-08-06 18:13:19 +01:00
sh_sir.c drivers: irda: fix sign bug 2010-07-15 20:27:57 -07:00
sir-dev.h
sir_dev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-10-23 11:47:02 -07:00
sir_dongle.c
smsc-ircc2.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
smsc-ircc2.h
smsc-sio.h
stir4200.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
tekram-sir.c
toim3232-sir.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
via-ircc.c drivers/net/irda: Eliminate memory leak 2010-08-25 16:36:49 -07:00
via-ircc.h drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
vlsi_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
vlsi_ir.h drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
w83977af.h
w83977af_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
w83977af_ir.h