summaryrefslogtreecommitdiffstats
path: root/net/unix/sysctl_net_unix.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-04-03 05:13:19 -0700
committerOlof Johansson <olof@lixom.net>2012-04-03 05:13:19 -0700
commitcfe2da5347950cf2c581ced7285dcafaa44aa626 (patch)
tree2ea86469e769aa2a1332e083bafb592e5923f289 /net/unix/sysctl_net_unix.c
parentbeca98c93dc8d838c3656bc62fd49b45622ef788 (diff)
parent7a4302a6a123e09b26fd7eae387e88e2d4dbc8c4 (diff)
Merge tag 'v3.4-rc1-imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
Linux-3.4-rc1 i.MX fixes * tag 'v3.4-rc1-imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: armadillo5x0: Fix smsc911x driver probe ARM: kzm_arm11_01: Fix smsc911x driver probe ARM: mx31lilly: Fix smsc911x driver probe ARM: mx31lite: Fix smsc911x driver probe ARM: mx53ard: Fix smsc911x driver probe ARM: mx35: Fix registration of camera clock ARM: 3ds_debugboard: Fix smsc911x driver probe MX2: Fix mx2_camera clock regression. ARM: mach-mx35_3ds: Fix build warning due to the lack of 'const' annotation
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions