Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 204409
b: refs/heads/master
c: 46cd09a
h: refs/heads/master
i:
  204407: 198bc8e
v: v3
  • Loading branch information
Uwe Kleine-König authored and Jiri Kosina committed Jun 16, 2010
1 parent 9516b2a commit d39a580
Show file tree
Hide file tree
Showing 3 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: 732bee7af3102cad811fb047dee8d15966efe569
refs/heads/master: 46cd09a7de52cad464d35a75924b79984646288d
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-omap2/sleep34xx.S
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#define SDRC_DLLA_CTRL_V OMAP34XX_SDRC_REGADDR(SDRC_DLLA_CTRL)

.text
/* Function to aquire the semaphore in scratchpad */
/* Function to acquire the semaphore in scratchpad */
ENTRY(lock_scratchpad_sem)
stmfd sp!, {lr} @ save registers on stack
wait_sem:
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/linux/lru_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ extern void lc_seq_dump_details(struct seq_file *seq, struct lru_cache *lc, char
* @lc: the lru cache to operate on
*
* Note that the reference counts and order on the active and lru lists may
* still change. Returns true if we aquired the lock.
* still change. Returns true if we acquired the lock.
*/
static inline int lc_try_lock(struct lru_cache *lc)
{
Expand Down

0 comments on commit d39a580

Please sign in to comment.