diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:24:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:24:40 -0700 |
| commit | bdf7cf1c83872a0586ce4c4da6889103cc36dbd3 (patch) | |
| tree | 9311bbcf8b9ffbe7207eba5cca557275f8151ae7 /security/apparmor/match.c | |
| parent | 40efeb4d0bb1993c3c10baff9b7d86839f99171e (diff) | |
| parent | ac04fee0b5c55bbac0858727a4154110b55d3f5a (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
loop: export module parameters
block: export blk_{get,put}_queue()
block: remove unused variable in bio_attempt_front_merge()
block: always allocate genhd->ev if check_events is implemented
brd: export module parameters
brd: fix comment on initial device creation
brd: handle on-demand devices correctly
brd: limit 'max_part' module param to DISK_MAX_PARTS
brd: get rid of unused members from struct brd_device
block: fix oops on !disk->queue and sysfs discard alignment display
Diffstat (limited to 'security/apparmor/match.c')
0 files changed, 0 insertions, 0 deletions