Linus Torvalds 008d23e485 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: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.		2011-01-13 10:05:56 -08:00
..
at91_cf.c
au1000_generic.c
au1000_generic.h
au1000_pb1x00.c
bcm63xx_pcmcia.c
bcm63xx_pcmcia.h
bfin_cf_pcmcia.c
cardbus.c
cirrus.h
cistpl.c
cs_internal.h
cs.c
db1xxx_ss.c
ds.c
electra_cf.c
i82092.c
i82092aa.h
i82365.c
i82365.h
Kconfig	ARM: pxa: Colibri PXA320 PCMCIA driver	2010-12-20 23:07:44 +08:00
m8xx_pcmcia.c	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
m32r_cfc.c
m32r_cfc.h	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
m32r_pcc.c
m32r_pcc.h	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
Makefile	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
o2micro.h
omap_cf.c
pcmcia_cis.c
pcmcia_resource.c	pcmcia: IOCARD is also required for using IRQs	2010-10-22 08:46:36 +02:00
pd6729.c	pd6729: Coding Style fixes	2010-11-10 14:29:09 +01:00
pd6729.h	pd6729: Coding Style fixes	2010-11-10 14:29:09 +01:00
pxa2xx_balloon3.c	ARM: pxa: Update Balloon3 for new FPGA firmware	2010-12-20 23:14:02 +08:00
pxa2xx_base.c	ARM: pxa: Add pxa320 PCMCIA check	2010-12-20 23:07:37 +08:00
pxa2xx_base.h
pxa2xx_cm_x2xx.c
pxa2xx_cm_x255.c
pxa2xx_cm_x270.c
pxa2xx_colibri.c	ARM: pxa: Colibri PXA320 PCMCIA driver	2010-12-20 23:07:44 +08:00
pxa2xx_e740.c
pxa2xx_lubbock.c
pxa2xx_mainstone.c
pxa2xx_palmld.c
pxa2xx_palmtc.c
pxa2xx_palmtx.c
pxa2xx_sharpsl.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
pxa2xx_stargate2.c
pxa2xx_trizeps4.c
pxa2xx_viper.c
pxa2xx_vpac270.c
ricoh.h
rsrc_iodyn.c
rsrc_mgr.c
rsrc_nonstatic.c
sa11xx_base.c
sa11xx_base.h
sa1100_assabet.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
sa1100_badge4.c
sa1100_cerf.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
sa1100_generic.c	Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel	2011-01-05 18:08:10 +00:00
sa1100_generic.h	ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.	2010-12-21 14:53:45 +00:00
sa1100_h3600.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
sa1100_jornada720.c
sa1100_nanoengine.c	ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support.	2010-12-21 14:53:45 +00:00
sa1100_neponset.c
sa1100_shannon.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
sa1100_simpad.c	pcmcia/sa1100: don't put machine specific init functions in .init.text	2010-11-10 14:30:01 +01:00
sa1111_generic.c
sa1111_generic.h
soc_common.c	Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel	2011-01-05 18:08:10 +00:00
soc_common.h	ARM: pxa: remove get_memclk_frequency_10khz()	2010-12-16 14:31:19 +08:00
socket_sysfs.c
tcic.c
tcic.h
ti113x.h
topic.h
vg468.h
vrc4171_card.c
vrc4173_cardu.c
vrc4173_cardu.h
xxs1500_ss.c
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