diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-07 20:46:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-07 20:46:39 -0800 |
| commit | 715695cac5f6670fd0eef18a0ffbcf6c824ab489 (patch) | |
| tree | 499a8eea7bb2501b96e6d2a2bb5df87be4a59e51 /drivers/w1/w1_family.c | |
| parent | 34d4ade77ba755afa6a2a04f043659781e4b6fc2 (diff) | |
| parent | 18b52ca5d0ea7f7d1933ebe8d277a1b499c940f2 (diff) | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: Update regulator names for debugfs compatiblity on SMDK6410
ARM: S3C64XX: Fix build with WM1190 disabled and WM1192 enabled on SMDK6410
ARM: S3C64XX: Reduce output of s3c64xx_dma_init1()
ARM: S3C64XX: Tone down SDHCI debugging
ARM: S3C64XX: Add clock for i2c1
ARM: S3C64XX: Staticise non-exported GPIO to interrupt functions
ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices
ARM: S3C64XX: Fix keypad setup to configure correct number of rows
ARM: S3C2440: Fix usage gpio bank j pin definitions on GTA02
ARM: S5P64X0: Fix number of GPIO lines in Bank F
ARM: S3C2440: Select missing S3C_DEV_USB_HOST on GTA02
Diffstat (limited to 'drivers/w1/w1_family.c')
0 files changed, 0 insertions, 0 deletions