android_kernel_samsung_univ.../arch/arm/plat-samsung
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/plat Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
adc.c
clock-clksrc.c
clock.c
dev-adc.c
dev-fb.c
dev-hsmmc.c
dev-hsmmc1.c
dev-hsmmc2.c
dev-hsmmc3.c
dev-hwmon.c
dev-i2c1.c
dev-i2c2.c
dev-i2c0.c
dev-ide.c
dev-keypad.c
dev-nand.c
dev-onenand.c
dev-rtc.c
dev-ts.c
dev-uart.c
dev-usb-hsotg.c
dev-usb.c
dev-wdt.c
dma.c
gpio-config.c
gpio.c
gpiolib.c
init.c
irq-uart.c
irq-vic-timer.c
Kconfig
Makefile
platformdata.c
pm-check.c
pm-gpio.c
pm.c
pwm-clock.c
pwm.c
s3c-pl330.c
time.c
wakeup-mask.c