mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'for-next' into for-linus
Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c
This commit is contained in:
commit
318ae2edc3
246 changed files with 396 additions and 3454 deletions
|
|
@ -169,7 +169,7 @@ static int scan_bitmap_block(struct reiserfs_transaction_handle *th,
|
|||
return 0; // No free blocks in this bitmap
|
||||
}
|
||||
|
||||
/* search for a first zero bit -- beggining of a window */
|
||||
/* search for a first zero bit -- beginning of a window */
|
||||
*beg = reiserfs_find_next_zero_le_bit
|
||||
((unsigned long *)(bh->b_data), boundary, *beg);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue