Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 275372
b: refs/heads/master
c: 24ed6dd
h: refs/heads/master
v: v3
  • Loading branch information
Geert Uytterhoeven committed Nov 8, 2011
1 parent 6b3659b commit ff97ab1
Show file tree
Hide file tree
Showing 157 changed files with 1,033 additions and 2,255 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e6f1227e8bc8a2ea2d76d09e19c89fa66c2f3a4c
refs/heads/master: 24ed6ddd9cbf084f1a2dfa3ef66287e5277002e1
308 changes: 140 additions & 168 deletions trunk/Documentation/DocBook/drm.tmpl

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions trunk/Documentation/cgroups/freezer-subsystem.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ demonstrate this problem using nested bash shells:

From a second, unrelated bash shell:
$ kill -SIGSTOP 16690
$ kill -SIGCONT 16690
$ kill -SIGCONT 16990

<at this point 16690 exits and causes 16644 to exit too>
<at this point 16990 exits and causes 16644 to exit too>

This happens because bash can observe both signals and choose how it
responds to them.
Expand Down
1 change: 0 additions & 1 deletion trunk/Documentation/sound/alsa/HD-Audio-Models.txt
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ STAC92HD83*
ref Reference board
mic-ref Reference board with power management for ports
dell-s14 Dell laptop
dell-vostro-3500 Dell Vostro 3500 laptop
hp HP laptops with (inverted) mute-LED
hp-dv7-4000 HP dv-7 4000
auto BIOS setup (default)
Expand Down
2 changes: 1 addition & 1 deletion trunk/Kbuild
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ always += missing-syscalls
targets += missing-syscalls

quiet_cmd_syscalls = CALL $<
cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags) $(missing_syscalls_flags)
cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags)

missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE
$(call cmd,syscalls)
Expand Down
10 changes: 1 addition & 9 deletions trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,6 @@ F: drivers/media/video/s5p-fimc/
ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
M: Kyungmin Park <kyungmin.park@samsung.com>
M: Kamil Debski <k.debski@samsung.com>
M: Jeongtae Park <jtp.park@samsung.com>
L: linux-arm-kernel@lists.infradead.org
L: linux-media@vger.kernel.org
S: Maintained
Expand Down Expand Up @@ -2343,13 +2342,6 @@ S: Supported
F: drivers/gpu/drm/i915
F: include/drm/i915*

DRM DRIVERS FOR EXYNOS
M: Inki Dae <inki.dae@samsung.com>
L: dri-devel@lists.freedesktop.org
S: Supported
F: drivers/gpu/drm/exynos
F: include/drm/exynos*

DSCC4 DRIVER
M: Francois Romieu <romieu@fr.zoreil.com>
L: netdev@vger.kernel.org
Expand Down Expand Up @@ -6130,7 +6122,7 @@ F: sound/
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
M: Liam Girdwood <lrg@ti.com>
M: Mark Brown <broonie@opensource.wolfsonmicro.com>
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
W: http://alsa-project.org/main/index.php/ASoC
S: Supported
Expand Down
31 changes: 31 additions & 0 deletions trunk/arch/m68k/Kconfig.devices
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,37 @@ config PROC_HARDWARE
including the model, CPU, MMU, clock speed, BogoMIPS rating,
and memory size.

config NATFEAT
bool "ARAnyM emulator support"
depends on ATARI
help
This option enables support for ARAnyM native features, such as
access to a disk image as /dev/hda.

config NFBLOCK
tristate "NatFeat block device support"
depends on BLOCK && NATFEAT
help
Say Y to include support for the ARAnyM NatFeat block device
which allows direct access to the hard drives without using
the hardware emulation.

config NFCON
tristate "NatFeat console driver"
depends on NATFEAT
help
Say Y to include support for the ARAnyM NatFeat console driver
which allows the console output to be redirected to the stderr
output of ARAnyM.

config NFETH
tristate "NatFeat Ethernet support"
depends on ETHERNET && NATFEAT
help
Say Y to include support for the ARAnyM NatFeat network device
which will emulate a regular ethernet device while presenting an
ethertap device to the host system.

endmenu

menu "Character devices"
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/mips/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,11 @@ CLEAN_FILES += vmlinux.32 vmlinux.64
archprepare:
ifdef CONFIG_MIPS32_N32
@echo ' Checking missing-syscalls for N32'
$(Q)$(MAKE) $(build)=. missing-syscalls missing_syscalls_flags="-mabi=n32"
$(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=n32"
endif
ifdef CONFIG_MIPS32_O32
@echo ' Checking missing-syscalls for O32'
$(Q)$(MAKE) $(build)=. missing-syscalls missing_syscalls_flags="-mabi=32"
$(Q)$(MAKE) $(build)=. missing-syscalls ccflags-y="-mabi=32"
endif

install:
Expand Down
236 changes: 0 additions & 236 deletions trunk/arch/powerpc/boot/dts/charon.dts

This file was deleted.

Loading

0 comments on commit ff97ab1

Please sign in to comment.