Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 312151
b: refs/heads/master
c: bff9d18
h: refs/heads/master
i:
  312149: 446cb77
  312147: e200624
  312143: f392981
v: v3
  • Loading branch information
Rafael J. Wysocki authored and Linus Torvalds committed Jul 21, 2012
1 parent b07da96 commit 40af1d2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition 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: 9a2bc8603eca4ea4a3a01163593084c5c1b3e16a
refs/heads/master: bff9d1865640dcb4d9711dcc50714e9a8b859453
1 change: 0 additions & 1 deletion trunk/include/linux/kernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@ extern enum system_states {
SYSTEM_HALT,
SYSTEM_POWER_OFF,
SYSTEM_RESTART,
SYSTEM_SUSPEND_DISK,
} system_state;

#define TAINT_PROPRIETARY_MODULE 0
Expand Down

0 comments on commit 40af1d2

Please sign in to comment.