aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys/keyctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-10 07:24:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-10 07:24:51 -0700
commit6ccaa3172941c0a97c7f1c5155b1d32ecd27ec2f (patch)
treef92588c8084f758c348120d712292d7f4a00edc7 /security/keys/keyctl.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff)
parentAT91: at91sam9261ek: remove C99 comments but keep information (diff)
downloadlinux-dev-6ccaa3172941c0a97c7f1c5155b1d32ecd27ec2f.tar.xz
linux-dev-6ccaa3172941c0a97c7f1c5155b1d32ecd27ec2f.zip
Merge branch 'at91-fixes-for-linus' of git://github.com/at91linux/linux-2.6-at91
* 'at91-fixes-for-linus' of git://github.com/at91linux/linux-2.6-at91: AT91: at91sam9261ek: remove C99 comments but keep information AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC AT91: dm9000 initialization update AT91: SAM9G45 - add a separate clock entry for every single TC block AT91: clock: peripheral clocks can have other parent than mck AT91: change dma resource index
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions