leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
229aebb873
linux/arch/arm/plat-samsung
History
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 ARM: SAMSUNG: Fix build warnings because of unused codes 2010-10-08 13:50:17 +09:00
clock-clksrc.c ARM: SAMSUNG: Fix bug in clksrc-clk round_rate call. 2010-01-18 16:00:56 +09:00
clock.c ARM: SAMSUNG: Add a workaround for get_clock() for serial driver 2010-10-08 13:50:18 +09:00
dev-adc.c ARM: SAMSUNG: Moving ADC device definition to plat-samsung. 2010-05-18 13:38:44 +09:00
dev-fb.c ARM: SAMSUNG: Set S3C_FB_MAX_WIN in <plat/fb.h> 2010-05-18 18:46:27 +09:00
dev-hsmmc1.c s5pc110: SDHCI-s3c can override host capabilities 2010-08-20 09:34:55 -07:00
dev-hsmmc2.c s5pc110: SDHCI-s3c can override host capabilities 2010-08-20 09:34:55 -07:00
dev-hsmmc3.c ARM: SAMSUNG: Add new s3c-sdhci card detection methods for Samsung SoCs 2010-08-05 18:32:50 +09:00
dev-hsmmc.c s5pc110: SDHCI-s3c can override host capabilities 2010-08-20 09:34:55 -07:00
dev-hwmon.c ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung 2010-05-12 17:43:03 +09:00
dev-i2c0.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
dev-i2c1.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
dev-i2c2.c ARM: S5PV210: add common I2C device helpers 2010-05-20 18:21:34 +09:00
dev-ide.c ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
dev-keypad.c ARM: SAMSUNG: Add keypad device support 2010-08-06 21:27:50 +09:00
dev-nand.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
dev-onenand.c ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
dev-rtc.c ARM: SAMSUNG: Move RTC device definitions in plat-samsung 2010-05-18 16:44:58 +09:00
dev-ts.c ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration 2010-05-19 18:25:30 +09:00
dev-uart.c ARM: SAMSUNG: Make UART device code common 2010-01-19 09:23:50 +09:00
dev-usb-hsotg.c ARM: SAMSUNG: Add DMA masks to hsotg device 2010-02-03 01:54:54 +00:00
dev-usb.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
dev-wdt.c ARM: SAMSUNG: Reduce virtual memory size for WDT device 2010-08-05 18:32:49 +09:00
dma.c ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung 2010-02-23 00:03:43 +00:00
gpio-config.c ARM: SAMSUNG: Fix on s5p_gpio_[get,set]_drvstr 2010-09-14 17:59:31 +09:00
gpio.c ARM: SAMSUNG: Add spinlock locking to GPIO banks 2010-05-11 17:45:46 +09:00
gpiolib.c ARM: SAMSUNG: Fix on inclusion mach/gpio.h on gpiolib.c 2010-08-06 21:28:39 +09:00
init.c ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung 2010-02-23 00:03:43 +00:00
irq-uart.c ARM: SAMSUNG: Move IRQ UART handling for newer devices to plat-samsung 2010-01-15 17:10:14 +09:00
irq-vic-timer.c ARM: SAMSUNG: Move IRQ VIC timer handling out to common header files 2010-01-15 17:10:13 +09:00
Kconfig Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux 2010-08-14 11:59:44 -07:00
Makefile Merge branch 'next-samsung' into for-next 2010-08-06 21:49:18 +09:00
platformdata.c ARM: SAMSUNG: Add helper to clone and set platform data 2010-08-05 18:32:49 +09:00
pm-check.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
pm-gpio.c ARM: SAMSUNG: fix suspend/resume on if some GPIO banks not present 2010-05-23 16:26:04 +01:00
pm.c ARM: SAMSUNG: Move pm.c to plat-samsung 2010-02-23 00:03:43 +00:00
pwm-clock.c ARM: SAMSUNG: Move pwm-clock code into plat-samsung 2010-01-15 17:10:12 +09:00
pwm.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
s3c-pl330.c S3C: DMA: Add api driver for PL330 2010-05-18 18:00:12 +09:00
time.c ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung 2010-02-23 00:03:43 +00:00
wakeup-mask.c ARM: SAMSUNG: Add support for interrupt wakeup-sources 2010-05-20 21:07:01 +09:00