Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 334447
b: refs/heads/master
c: 43c422e
h: refs/heads/master
i:
  334445: d82ca3f
  334443: 83c6eaf
  334439: c8c70af
  334431: 4dcb8e0
v: v3
  • Loading branch information
John Johansen authored and Linus Torvalds committed Oct 17, 2012
1 parent 39fbe4e commit c8b861c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 985c9e615a605041d728c08b83d3dda19ae7def8
refs/heads/master: 43c422eda99b894f18d1cca17bcd2401efaf7bd0
2 changes: 1 addition & 1 deletion trunk/security/apparmor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \

$(obj)/capability.o : $(obj)/capability_names.h
$(obj)/resource.o : $(obj)/rlim_names.h
$(obj)/capability_names.h : $(srctree)/include/linux/capability.h \
$(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \
$(src)/Makefile
$(call cmd,make-caps)
$(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \
Expand Down

0 comments on commit c8b861c

Please sign in to comment.