aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys/keyctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:10:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-15 15:10:27 -0700
commitbd72f85b9ad6cf41bc771de0cd27d892c41b4396 (patch)
tree3fd0909295dd427c4016dd8c09fae0050e007512 /security/keys/keyctl.c
parentMerge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 (diff)
parentMerge branch 'misc' into release (diff)
downloadlinux-dev-bd72f85b9ad6cf41bc771de0cd27d892c41b4396.tar.xz
linux-dev-bd72f85b9ad6cf41bc771de0cd27d892c41b4396.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI button: don't try to use a non-existent lid device ACPI: video: Loosen strictness of video bus detection code eeepc-laptop: Prevent a panic when disabling RT2860 wireless when associated eeepc-laptop: Properly annote eeepc_enable_camera(). ACPI / PCI: Fix NULL pointer dereference in acpi_get_pci_dev() (rev. 2) fujitsu-laptop: address missed led-class ifdef fixup ACPI: Kconfig, fix proc aggregator text ACPI: add AC/DC notifier
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions