diff options
| author | Linus Torvalds <[email protected]> | 2007-09-17 05:24:49 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2007-09-17 05:24:49 +0000 |
| commit | c2f828977ba5d17c13debba374ea252d18e5ccfb (patch) | |
| tree | 49d95c5e9325f93f379e5c249bf5a39f8e8040ae /security/selinux/hooks.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp... (diff) | |
| parent | Pull thinkpad into release branch (diff) | |
| download | kernel-c2f828977ba5d17c13debba374ea252d18e5ccfb.tar.gz kernel-c2f828977ba5d17c13debba374ea252d18e5ccfb.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: thinkpad-acpi: bump up version to 0.16
ACPI: thinkpad-acpi: revert new 2.6.23 CONFIG_THINKPAD_ACPI_INPUT_ENABLED option
ACPI: fix CONFIG_NET=n acpi_bus_generate_netlink_event build failure
msi-laptop: replace ',' with ';'
ACPI: (more) delete CONFIG_ACPI_PROCFS_SLEEP (again)
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions