From d39a5801ad138127243eb5fe7b861a888a4a0586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 11 Jun 2010 12:16:57 +0200 Subject: [PATCH] --- yaml --- r: 204409 b: refs/heads/master c: 46cd09a7de52cad464d35a75924b79984646288d h: refs/heads/master i: 204407: 198bc8edca70457b9b5e3d0f8dabb12118d43d3f v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/sleep34xx.S | 2 +- trunk/include/linux/lru_cache.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index da91fa7d1c67..e357d2cc497a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 732bee7af3102cad811fb047dee8d15966efe569 +refs/heads/master: 46cd09a7de52cad464d35a75924b79984646288d diff --git a/trunk/arch/arm/mach-omap2/sleep34xx.S b/trunk/arch/arm/mach-omap2/sleep34xx.S index d522cd70bf53..ba53191ae4c5 100644 --- a/trunk/arch/arm/mach-omap2/sleep34xx.S +++ b/trunk/arch/arm/mach-omap2/sleep34xx.S @@ -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: diff --git a/trunk/include/linux/lru_cache.h b/trunk/include/linux/lru_cache.h index de48d167568b..78fbf24f357a 100644 --- a/trunk/include/linux/lru_cache.h +++ b/trunk/include/linux/lru_cache.h @@ -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) {