linux/arch/arm/plat-samsung/include/plat
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
..
adc-core.h ARM: SAMSUNG: Implement set_name function for ADC devices 2010-08-05 18:32:50 +09:00
adc.h Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
ata-core.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
ata.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
audio.h
clock-clksrc.h
clock.h
cpu-freq.h
cpu.h ARM: S5P64X0: Replace the 6440 system device class definition with 64x0 2010-10-18 18:33:04 +09:00
debug-macro.S
devs.h ARM: S5P64X0: Update Audio support 2010-10-18 18:33:03 +09:00
dma-core.h
dma-s3c24xx.h
dma.h
fb-core.h s3c-fb: add device name initialization 2010-08-11 08:59:10 -07:00
fb.h s3c-fb: add default window feature. 2010-08-11 08:59:09 -07:00
fimc-core.h ARM: SAMSUNG: Add platform definitions and helpers for FIMC driver 2010-08-06 21:28:35 +09:00
gpio-cfg-helpers.h
gpio-cfg.h ARM: SAMSUNG: Fix on drive strength value 2010-09-14 17:59:23 +09:00
gpio-core.h
hwmon.h
iic-core.h
iic.h
irq-uart.h
irq-vic-timer.h
keypad-core.h ARM: S5PV210: Add keypad device helpers 2010-08-05 18:31:01 +09:00
keypad.h ARM: SAMSUNG: Add keypad device support 2010-08-06 21:27:50 +09:00
map-base.h
nand.h
onenand-core.h
pll6553x.h
pm.h
regs-ac97.h
regs-adc.h
regs-ata.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
regs-fb-v4.h s3c-fb: integrate palette setup code into main driver 2010-08-11 08:59:10 -07:00
regs-fb.h s3c-fb: add support for DMA channel control on S5PV210 2010-08-11 08:59:12 -07:00
regs-iic.h
regs-irqtype.h
regs-nand.h
regs-onenand.h
regs-rtc.h ARM: SAMSUNG: Updates RTC register for support Alarm IRQ and Time Tick. 2010-08-05 18:32:51 +09:00
regs-sdhci.h
regs-serial.h ARM: SAMSUNG: serial: Add FRACVAL support for newer UART 2010-08-05 18:32:41 +09:00
regs-timer.h
regs-usb-hsotg-phy.h
regs-usb-hsotg.h USB: s3c-hsotg: Add initial detection and setup for dedicated FIFO mode 2010-08-10 14:35:42 -07:00
regs-watchdog.h
s3c-dma-pl330.h ARM: S5P64X0: Move DMA support for S5P64X0 2010-10-18 18:33:03 +09:00
s3c-pl330-pdata.h
s3c64xx-spi.h Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-10-21 16:42:32 -07:00
sdhci.h Merge branch 'next-samsung' into for-next 2010-08-06 21:49:18 +09:00
ts.h
udc-hs.h
uncompress.h
usb-control.h
wakeup-mask.h
watchdog-reset.h