Fan Du
65e0736bc2
xfrm: remove redundant parameter "int dir" in struct xfrm_mgr.acquire ...
Sematically speaking, xfrm_mgr.acquire is called when kernel intends to ask
user space IKE daemon to negotiate SAs with peers. IOW the direction will
*always* be XFRM_POLICY_OUT, so remove int dir for clarity.
Signed-off-by: Fan Du <fan.du@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-08-15 15:13:30 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-30 17:25:34 -07:00
drm/exynos: add property for plane zpos
2012-07-27 11:13:54 +09:00
packet: Report socket mclist info via diag module
2012-08-14 16:56:33 -07:00
[media] v4l2: add core support for the new VIDIOC_ENUM_FREQ_BANDS ioctl
2012-07-30 20:23:05 -03:00
xfrm: remove redundant parameter "int dir" in struct xfrm_mgr.acquire
2012-08-15 15:13:30 -07:00
Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus
2012-07-22 23:26:17 -07:00
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
2012-07-25 15:58:48 -04:00
Sound fixes for 3.6-rc1
2012-08-01 10:42:26 -07:00
target: Allow for target_submit_cmd() returning errors
2012-07-17 17:05:05 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-07-31 19:25:39 -07:00
video: da8xx-fb: configure FIFO threshold to reduce underflow errors
2012-07-29 01:11:09 +00:00
xen PVonHVM: move shared_info to MMIO before kexec
2012-07-19 15:52:05 -04:00
65e0736bc2