kernel_optimize_test/arch/arm/mach-omap1
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
..
include/mach
ams-delta-fiq-handler.S
ams-delta-fiq.c
board-ams-delta.c
board-fsample.c
board-generic.c
board-h2-mmc.c
board-h2.c
board-h2.h
board-h3-mmc.c
board-h3.c
board-h3.h
board-htcherald.c
board-innovator.c
board-nokia770.c
board-osk.c
board-palmte.c
board-palmtt.c
board-palmz71.c
board-perseus2.c
board-sx1-mmc.c
board-sx1.c
board-voiceblue.c
clock_data.c
clock.c
clock.h
devices.c
flash.c
fpga.c
i2c.c
id.c
io.c
irq.c
Kconfig
lcd_dma.c
leds-h2p2-debug.c
leds-innovator.c
leds-osk.c
leds.c
leds.h
mailbox.c
Makefile
Makefile.boot
mcbsp.c
mux.c
opp_data.c
opp.h
pm.c
pm.h
serial.c
sleep.S
sram.S
time.c
timer32k.c
usb.c