aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys/keyctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:09:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:09:55 -0700
commit13e356c977473baeb29e8abfd992f0cd938a78ce (patch)
tree7aefdefbe380d554c7c06fbed3f9663cc02d5b92 /security/keys/keyctl.c
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff)
parentMerge branch '2_6_32rc4_fixes' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus (diff)
downloadlinux-dev-13e356c977473baeb29e8abfd992f0cd938a78ce.tar.xz
linux-dev-13e356c977473baeb29e8abfd992f0cd938a78ce.zip
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: OMAP2xxx clock: set up clockdomain pointer in struct clk OMAP: Fix race condition with autodeps omap: McBSP: Fix incorrect receiver stop in omap_mcbsp_stop omap: Initialization of SDRC params on Zoom2 omap: RX-51: Drop I2C-1 speed to 2200 omap: SDMA: Fixing bug in omap_dma_set_global_params() omap: CONFIG_ISP1301_OMAP redefined in Beagle defconfig
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions