Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 93b9e9a2d91b8a6c93f14e98382694f83de9f02e

Authored by Linus Torvalds
2 parents c3d1f1746b 9354a55f94
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] increase ia64 static per cpu area
  [IA64] Put ia64 config files on the Uwe Kleine-König diet
  [IA64] perfmon: convert to unlocked_ioctl
  [IA64] beautify vmlinux.lds.h

Warning! This is a large diff.

To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.

Showing 10 changed files Side-by-side Diff