Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a379e21 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents a49da881 fdc3452c

Documentation/devicetree/bindings/clock/exynos5250-clock.txt

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ clock which they consume. 
  mixer			343

  hdmi			344

  g2d			345

  mdma0			346

  smmu_mdma0		347





   [Clock Muxes]

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -1368,6 +1368,9 @@ T: git git://git.xilinx.com/linux-xlnx.git 
S:	Supported

F:	arch/arm/mach-zynq/

F:	drivers/cpuidle/cpuidle-zynq.c

N:	zynq

N:	xilinx

F:	drivers/clocksource/cadence_ttc_timer.c



ARM SMMU DRIVER

M:	Will Deacon <will.deacon@arm.com>
@@ -2815,8 +2818,10 @@ F: include/uapi/drm/ 


INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

M:	Daniel Vetter <daniel.vetter@ffwll.ch>

M:	Jani Nikula <jani.nikula@linux.intel.com>

L:	intel-gfx@lists.freedesktop.org

L:	dri-devel@lists.freedesktop.org

Q:	http://patchwork.freedesktop.org/project/intel-gfx/

T:	git git://people.freedesktop.org/~danvet/drm-intel

S:	Supported

F:	drivers/gpu/drm/i915/

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 13

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = One Giant Leap for Frogkind



# *DOCUMENTATION*

arch/arm/boot/dts/exynos5250.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ 
			compatible = "arm,pl330", "arm,primecell";

			reg = <0x10800000 0x1000>;

			interrupts = <0 33 0>;

			clocks = <&clock 271>;

			clocks = <&clock 346>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

			#dma-channels = <8>;

arch/arm/crypto/aesbs-core.S_shipped

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
# define VFP_ABI_FRAME	0

# define BSAES_ASM_EXTENDED_KEY

# define XTS_CHAIN_TWEAK

# define __ARM_ARCH__ __LINUX_ARM_ARCH__

# define __ARM_ARCH__	7

#endif



#ifdef __thumb__