diff --git a/[refs] b/[refs]
index fa658d0a719e..37248f4f21b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 165ac433fa3f01ba99b29972f3adc283d03b0f17
+refs/heads/master: 96b8d4c19d797200b973caab57ca842531184c13
diff --git a/trunk/arch/avr32/include/asm/bitops.h b/trunk/arch/avr32/include/asm/bitops.h
index 1a50b69b1a19..f7dd5f71edf7 100644
--- a/trunk/arch/avr32/include/asm/bitops.h
+++ b/trunk/arch/avr32/include/asm/bitops.h
@@ -263,6 +263,11 @@ static inline int fls(unsigned long word)
 	return 32 - result;
 }
 
+static inline int __fls(unsigned long word)
+{
+	return fls(word) - 1;
+}
+
 unsigned long find_first_zero_bit(const unsigned long *addr,
 				  unsigned long size);
 unsigned long find_next_zero_bit(const unsigned long *addr,