Merge branch 'lpc32xx/core' of git://git.antcom.de/linux-2.6 into next/soc

* 'lpc32xx/core' of git://git.antcom.de/linux-2.6:
  ARM: LPC32xx: Remove board specific GPIO init
  ARM: LPC32xx: Provide DMA filter callbacks via platform data
  ARM: LPC32xx: Use handle_edge_irq() callback on edge type irqs
  + sync to 3.6-rc4

1 files changed, 0 insertions, 3 deletions

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index c3fa6c5327a3..71a197f0f93d 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1157,9 +1157,6 @@ static int check_free_space(struct ubifs_info *c)
  *
  * This function mounts UBIFS file system. Returns zero in case of success and
  * a negative error code in case of failure.
- *
- * Note, the function does not de-allocate resources it it fails half way
- * through, and the caller has to do this instead.
  */
 static int mount_ubifs(struct ubifs_info *c)
 {