Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 309709
b: refs/heads/master
c: ee5e568
h: refs/heads/master
i:
  309707: 28abc10
v: v3
  • Loading branch information
Wei Yang authored and Linus Torvalds committed Jun 1, 2012
1 parent 332eb97 commit 863e523
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: a3860c1c5dd1137db23d7786d284939c5761d517
refs/heads/master: ee5e5683d8ac3fec876cb6c26792212f773d5898
4 changes: 2 additions & 2 deletions trunk/kernel/resource.c
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,8 @@ int reallocate_resource(struct resource *root, struct resource *old,
* @root: root resource descriptor
* @new: resource descriptor desired by caller
* @size: requested resource region size
* @min: minimum size to allocate
* @max: maximum size to allocate
* @min: minimum boundary to allocate
* @max: maximum boundary to allocate
* @align: alignment requested, in bytes
* @alignf: alignment function, optional, called if not NULL
* @alignf_data: arbitrary data to pass to the @alignf function
Expand Down

0 comments on commit 863e523

Please sign in to comment.